Skip check in intervals for projects with completed auction and no winning deployers (#60)

Part of https://www.notion.so/Laconic-Mainnet-Plan-1eca6b22d47280569cd0d1e6d711d949

- Contains formatting changes from prettier

Reviewed-on: #60
Co-authored-by: Nabarun <nabarun@deepstacksoft.com>
Co-committed-by: Nabarun <nabarun@deepstacksoft.com>

.gitea/workflows/deploy-frontend.yaml

@@ -47,11 +47,11 @@ jobs:
           cat > packages/deployer/config.yml <<EOF
           services:
             registry:
-              rpcEndpoint: https://laconicd-sapo.laconic.com
+              rpcEndpoint: https://laconicd-mainnet-1.laconic.com
-              gqlEndpoint: https://laconicd-sapo.laconic.com/api
+              gqlEndpoint: https://laconicd-mainnet-1.laconic.com/api
               userKey: $REGISTRY_USER_KEY
               bondId: $REGISTRY_BOND_ID
-              chainId: laconic-testnet-2
+              chainId: laconic-mainnet
               gasPrice: 0.001alnt
           EOF
 

build-webapp.sh

@@ -15,8 +15,6 @@ 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'

package.json

@@ -14,5 +14,6 @@
     "prepare": "husky install",
     "build": "lerna run build --stream",
     "lint": "lerna run lint --stream"
-  }
+  },
-}
+  "packageManager": "yarn@1.22.19+sha1.4ba7fc5c6e704fce2066ecbfb0b0d8976fe62447"
+}

packages/backend/src/database.ts

@@ -5,7 +5,7 @@ import {
   FindOneOptions,
   FindOptionsWhere,
   IsNull,
-  Not
+  Not,
 } from 'typeorm';
 import path from 'path';
 import debug from 'debug';
@@ -16,7 +16,7 @@ import { lowercase, numbers } from 'nanoid-dictionary';
 import { DatabaseConfig } from './config';
 import { User } from './entity/User';
 import { Organization } from './entity/Organization';
-import { Project } from './entity/Project';
+import { AuctionStatus, Project } from './entity/Project';
 import { Deployment, DeploymentStatus } from './entity/Deployment';
 import { ProjectMember } from './entity/ProjectMember';
 import { EnvironmentVariable } from './entity/EnvironmentVariable';
@@ -42,7 +42,7 @@ export class Database {
       database: dbPath,
       entities: [path.join(__dirname, '/entity/*')],
       synchronize: true,
-      logging: false
+      logging: false,
     });
   }
 
@@ -54,21 +54,24 @@ export class Database {
 
     // Load an organization if none exist
     if (!organizations.length) {
-      const orgEntities = await getEntities(path.resolve(__dirname, ORGANIZATION_DATA_PATH));
+      const orgEntities = await getEntities(
-      organizations = await loadAndSaveData(Organization, this.dataSource, [orgEntities[0]]);
+        path.resolve(__dirname, ORGANIZATION_DATA_PATH),
+      );
+      organizations = await loadAndSaveData(Organization, this.dataSource, [
+        orgEntities[0],
+      ]);
     }
 
     // Hotfix for updating old DB data
     if (organizations[0].slug === 'snowball-tools-1') {
-      const [orgEntity] = await getEntities(path.resolve(__dirname, ORGANIZATION_DATA_PATH));
+      const [orgEntity] = await getEntities(
+        path.resolve(__dirname, ORGANIZATION_DATA_PATH),
+      );
 
-      await this.updateOrganization(
+      await this.updateOrganization(organizations[0].id, {
-        organizations[0].id,
+        slug: orgEntity.slug as string,
-        {
+        name: orgEntity.name as string,
-          slug: orgEntity.slug as string,
+      });
-          name: orgEntity.name as string
-        }
-      )
     }
   }
 
@@ -95,7 +98,7 @@ export class Database {
   }
 
   async getOrganizations(
-    options: FindManyOptions<Organization>
+    options: FindManyOptions<Organization>,
   ): Promise<Organization[]> {
     const organizationRepository = this.dataSource.getRepository(Organization);
     const organizations = await organizationRepository.find(options);
@@ -104,7 +107,7 @@ export class Database {
   }
 
   async getOrganization(
-    options: FindOneOptions<Organization>
+    options: FindOneOptions<Organization>,
   ): Promise<Organization | null> {
     const organizationRepository = this.dataSource.getRepository(Organization);
     const organization = await organizationRepository.findOne(options);
@@ -119,25 +122,34 @@ export class Database {
       where: {
         userOrganizations: {
           member: {
-            id: userId
+            id: userId,
-          }
+          },
-        }
+        },
-      }
+      },
     });
 
     return userOrgs;
   }
 
-  async addUserOrganization(data: DeepPartial<UserOrganization>): Promise<UserOrganization> {
+  async addUserOrganization(
-    const userOrganizationRepository = this.dataSource.getRepository(UserOrganization);
+    data: DeepPartial<UserOrganization>,
+  ): Promise<UserOrganization> {
+    const userOrganizationRepository =
+      this.dataSource.getRepository(UserOrganization);
     const newUserOrganization = await userOrganizationRepository.save(data);
 
     return newUserOrganization;
   }
 
-  async updateOrganization(organizationId: string, data: DeepPartial<Organization>): Promise<boolean> {
+  async updateOrganization(
+    organizationId: string,
+    data: DeepPartial<Organization>,
+  ): Promise<boolean> {
     const organizationRepository = this.dataSource.getRepository(Organization);
-    const updateResult = await organizationRepository.update({ id: organizationId }, data);
+    const updateResult = await organizationRepository.update(
+      { id: organizationId },
+      data,
+    );
     assert(updateResult.affected);
 
     return updateResult.affected > 0;
@@ -158,7 +170,7 @@ export class Database {
       .leftJoinAndSelect(
         'project.deployments',
         'deployments',
-        'deployments.isCurrent = true AND deployments.isCanonical = true'
+        'deployments.isCurrent = true AND deployments.isCanonical = true',
       )
       .leftJoinAndSelect('deployments.createdBy', 'user')
       .leftJoinAndSelect('deployments.deployer', 'deployer')
@@ -166,7 +178,7 @@ export class Database {
       .leftJoinAndSelect('project.deployers', 'deployers')
       .leftJoinAndSelect('project.organization', 'organization')
       .where('project.id = :projectId', {
-        projectId
+        projectId,
       })
       .getOne();
 
@@ -174,26 +186,28 @@ export class Database {
   }
 
   async allProjectsWithoutDeployments(): Promise<Project[]> {
+    // Fetch all projects with auction not completed and wihout any deployments
     const allProjects = await this.getProjects({
       where: {
         auctionId: Not(IsNull()),
+        auctionStatus: Not(AuctionStatus.Completed),
       },
       relations: ['deployments'],
       withDeleted: true,
     });
 
-    const projects = allProjects.filter(project => {
+    const activeProjectsWithoutDeployments = allProjects.filter((project) => {
       if (project.deletedAt !== null) return false;
 
       return project.deployments.length === 0;
     });
 
-    return projects;
+    return activeProjectsWithoutDeployments;
   }
 
   async getProjectsInOrganization(
     userId: string,
-    organizationSlug: string
+    organizationSlug: string,
   ): Promise<Project[]> {
     const projectRepository = this.dataSource.getRepository(Project);
 
@@ -202,7 +216,7 @@ export class Database {
       .leftJoinAndSelect(
         'project.deployments',
         'deployments',
-        'deployments.isCurrent = true AND deployments.isCanonical = true'
+        'deployments.isCurrent = true AND deployments.isCanonical = true',
       )
       .leftJoin('project.projectMembers', 'projectMembers')
       .leftJoin('project.organization', 'organization')
@@ -210,8 +224,8 @@ export class Database {
         '(project.ownerId = :userId OR projectMembers.userId = :userId) AND organization.slug = :organizationSlug',
         {
           userId,
-          organizationSlug
+          organizationSlug,
-        }
+        },
       )
       .getMany();
 
@@ -222,7 +236,7 @@ export class Database {
    * Get deployments with specified filter
    */
   async getDeployments(
-    options: FindManyOptions<Deployment>
+    options: FindManyOptions<Deployment>,
   ): Promise<Deployment[]> {
     const deploymentRepository = this.dataSource.getRepository(Deployment);
     const deployments = await deploymentRepository.find(options);
@@ -239,16 +253,18 @@ export class Database {
       },
       where: {
         project: {
-          id: projectId
+          id: projectId,
-        }
+        },
       },
       order: {
-        createdAt: 'DESC'
+        createdAt: 'DESC',
-      }
+      },
     });
   }
 
-  async getNonCanonicalDeploymentsByProjectId(projectId: string): Promise<Deployment[]> {
+  async getNonCanonicalDeploymentsByProjectId(
+    projectId: string,
+  ): Promise<Deployment[]> {
     return this.getDeployments({
       relations: {
         project: true,
@@ -257,18 +273,18 @@ export class Database {
       },
       where: {
         project: {
-          id: projectId
+          id: projectId,
         },
-        isCanonical: false
+        isCanonical: false,
       },
       order: {
-        createdAt: 'DESC'
+        createdAt: 'DESC',
-      }
+      },
     });
   }
 
   async getDeployment(
-    options: FindOneOptions<Deployment>
+    options: FindOneOptions<Deployment>,
   ): Promise<Deployment | null> {
     const deploymentRepository = this.dataSource.getRepository(Deployment);
     const deployment = await deploymentRepository.findOne(options);
@@ -290,7 +306,7 @@ export class Database {
 
     const updatedData = {
       ...data,
-      id
+      id,
     };
     const deployment = await deploymentRepository.save(updatedData);
 
@@ -298,7 +314,7 @@ export class Database {
   }
 
   async getProjectMembersByProjectId(
-    projectId: string
+    projectId: string,
   ): Promise<ProjectMember[]> {
     const projectMemberRepository =
       this.dataSource.getRepository(ProjectMember);
@@ -306,13 +322,13 @@ export class Database {
     const projectMembers = await projectMemberRepository.find({
       relations: {
         project: true,
-        member: true
+        member: true,
       },
       where: {
         project: {
-          id: projectId
+          id: projectId,
-        }
+        },
-      }
+      },
     });
 
     return projectMembers;
@@ -320,7 +336,7 @@ export class Database {
 
   async getEnvironmentVariablesByProjectId(
     projectId: string,
-    filter?: FindOptionsWhere<EnvironmentVariable>
+    filter?: FindOptionsWhere<EnvironmentVariable>,
   ): Promise<EnvironmentVariable[]> {
     const environmentVariableRepository =
       this.dataSource.getRepository(EnvironmentVariable);
@@ -328,10 +344,10 @@ export class Database {
     const environmentVariables = await environmentVariableRepository.find({
       where: {
         project: {
-          id: projectId
+          id: projectId,
         },
-        ...filter
+        ...filter,
-      }
+      },
     });
 
     return environmentVariables;
@@ -342,7 +358,7 @@ export class Database {
       this.dataSource.getRepository(ProjectMember);
 
     const deleteResult = await projectMemberRepository.delete({
-      id: projectMemberId
+      id: projectMemberId,
     });
 
     if (deleteResult.affected) {
@@ -354,20 +370,20 @@ export class Database {
 
   async updateProjectMemberById(
     projectMemberId: string,
-    data: DeepPartial<ProjectMember>
+    data: DeepPartial<ProjectMember>,
   ): Promise<boolean> {
     const projectMemberRepository =
       this.dataSource.getRepository(ProjectMember);
     const updateResult = await projectMemberRepository.update(
       { id: projectMemberId },
-      data
+      data,
     );
 
     return Boolean(updateResult.affected);
   }
 
   async addProjectMember(
-    data: DeepPartial<ProjectMember>
+    data: DeepPartial<ProjectMember>,
   ): Promise<ProjectMember> {
     const projectMemberRepository =
       this.dataSource.getRepository(ProjectMember);
@@ -377,7 +393,7 @@ export class Database {
   }
 
   async addEnvironmentVariables(
-    data: DeepPartial<EnvironmentVariable>[]
+    data: DeepPartial<EnvironmentVariable>[],
   ): Promise<EnvironmentVariable[]> {
     const environmentVariableRepository =
       this.dataSource.getRepository(EnvironmentVariable);
@@ -389,25 +405,25 @@ export class Database {
 
   async updateEnvironmentVariable(
     environmentVariableId: string,
-    data: DeepPartial<EnvironmentVariable>
+    data: DeepPartial<EnvironmentVariable>,
   ): Promise<boolean> {
     const environmentVariableRepository =
       this.dataSource.getRepository(EnvironmentVariable);
     const updateResult = await environmentVariableRepository.update(
       { id: environmentVariableId },
-      data
+      data,
     );
 
     return Boolean(updateResult.affected);
   }
 
   async deleteEnvironmentVariable(
-    environmentVariableId: string
+    environmentVariableId: string,
   ): Promise<boolean> {
     const environmentVariableRepository =
       this.dataSource.getRepository(EnvironmentVariable);
     const deleteResult = await environmentVariableRepository.delete({
-      id: environmentVariableId
+      id: environmentVariableId,
     });
 
     if (deleteResult.affected) {
@@ -424,13 +440,13 @@ export class Database {
     const projectMemberWithProject = await projectMemberRepository.find({
       relations: {
         project: {
-          owner: true
+          owner: true,
         },
-        member: true
+        member: true,
       },
       where: {
-        id: projectMemberId
+        id: projectMemberId,
-      }
+      },
     });
 
     if (projectMemberWithProject.length === 0) {
@@ -442,7 +458,7 @@ export class Database {
 
   async getProjectsBySearchText(
     userId: string,
-    searchText: string
+    searchText: string,
   ): Promise<Project[]> {
     const projectRepository = this.dataSource.getRepository(Project);
 
@@ -454,8 +470,8 @@ export class Database {
         '(project.owner = :userId OR projectMembers.member.id = :userId) AND project.name LIKE :searchText',
         {
           userId,
-          searchText: `%${searchText}%`
+          searchText: `%${searchText}%`,
-        }
+        },
       )
       .getMany();
 
@@ -464,14 +480,14 @@ export class Database {
 
   async updateDeploymentById(
     deploymentId: string,
-    data: DeepPartial<Deployment>
+    data: DeepPartial<Deployment>,
   ): Promise<boolean> {
     return this.updateDeployment({ id: deploymentId }, data);
   }
 
   async updateDeployment(
     criteria: FindOptionsWhere<Deployment>,
-    data: DeepPartial<Deployment>
+    data: DeepPartial<Deployment>,
   ): Promise<boolean> {
     const deploymentRepository = this.dataSource.getRepository(Deployment);
     const updateResult = await deploymentRepository.update(criteria, data);
@@ -481,7 +497,7 @@ export class Database {
 
   async updateDeploymentsByProjectIds(
     projectIds: string[],
-    data: DeepPartial<Deployment>
+    data: DeepPartial<Deployment>,
   ): Promise<boolean> {
     const deploymentRepository = this.dataSource.getRepository(Deployment);
 
@@ -499,8 +515,8 @@ export class Database {
     const deploymentRepository = this.dataSource.getRepository(Deployment);
     const deployment = await deploymentRepository.findOneOrFail({
       where: {
-        id: deploymentId
+        id: deploymentId,
-      }
+      },
     });
 
     const deleteResult = await deploymentRepository.softRemove(deployment);
@@ -508,7 +524,11 @@ export class Database {
     return Boolean(deleteResult);
   }
 
-  async addProject(user: User, organizationId: string, data: DeepPartial<Project>): Promise<Project> {
+  async addProject(
+    user: User,
+    organizationId: string,
+    data: DeepPartial<Project>,
+  ): Promise<Project> {
     const projectRepository = this.dataSource.getRepository(Project);
 
     // TODO: Check if organization exists
@@ -521,7 +541,7 @@ export class Database {
     newProject.owner = user;
 
     newProject.organization = Object.assign(new Organization(), {
-      id: organizationId
+      id: organizationId,
     });
 
     return projectRepository.save(newProject);
@@ -535,12 +555,12 @@ export class Database {
 
   async updateProjectById(
     projectId: string,
-    data: DeepPartial<Project>
+    data: DeepPartial<Project>,
   ): Promise<boolean> {
     const projectRepository = this.dataSource.getRepository(Project);
     const updateResult = await projectRepository.update(
       { id: projectId },
-      data
+      data,
     );
 
     return Boolean(updateResult.affected);
@@ -550,11 +570,11 @@ export class Database {
     const projectRepository = this.dataSource.getRepository(Project);
     const project = await projectRepository.findOneOrFail({
       where: {
-        id: projectId
+        id: projectId,
       },
       relations: {
-        projectMembers: true
+        projectMembers: true,
-      }
+      },
     });
 
     const deleteResult = await projectRepository.softRemove(project);
@@ -590,7 +610,7 @@ export class Database {
 
   async updateDomainById(
     domainId: string,
-    data: DeepPartial<Domain>
+    data: DeepPartial<Domain>,
   ): Promise<boolean> {
     const domainRepository = this.dataSource.getRepository(Domain);
     const updateResult = await domainRepository.update({ id: domainId }, data);
@@ -600,39 +620,37 @@ export class Database {
 
   async getDomainsByProjectId(
     projectId: string,
-    filter?: FindOptionsWhere<Domain>
+    filter?: FindOptionsWhere<Domain>,
   ): Promise<Domain[]> {
     const domainRepository = this.dataSource.getRepository(Domain);
 
     const domains = await domainRepository.find({
       relations: {
-        redirectTo: true
+        redirectTo: true,
       },
       where: {
         project: {
-          id: projectId
+          id: projectId,
         },
-        ...filter
+        ...filter,
-      }
+      },
     });
 
     return domains;
   }
 
-  async getOldestDomainByProjectId(
+  async getOldestDomainByProjectId(projectId: string): Promise<Domain | null> {
-    projectId: string,
-  ): Promise<Domain | null> {
     const domainRepository = this.dataSource.getRepository(Domain);
 
     const domain = await domainRepository.findOne({
       where: {
         project: {
-          id: projectId
+          id: projectId,
         },
       },
       order: {
-        createdAt: 'ASC'
+        createdAt: 'ASC',
-      }
+      },
     });
 
     return domain;
@@ -651,8 +669,8 @@ export class Database {
         status: DeploymentStatus.Ready,
       },
       order: {
-        createdAt: 'DESC'
+        createdAt: 'DESC',
-      }
+      },
     });
 
     if (deployment === null) {
@@ -677,7 +695,9 @@ export class Database {
 
   async getDeployerByLRN(deployerLrn: string): Promise<Deployer | null> {
     const deployerRepository = this.dataSource.getRepository(Deployer);
-    const deployer = await deployerRepository.findOne({ where: { deployerLrn } });
+    const deployer = await deployerRepository.findOne({
+      where: { deployerLrn },
+    });
 
     return deployer;
   }

packages/backend/src/entity/Project.ts

@@ -9,7 +9,7 @@ import {
   OneToMany,
   DeleteDateColumn,
   JoinTable,
-  ManyToMany
+  ManyToMany,
 } from 'typeorm';
 
 import { User } from './User';
@@ -18,6 +18,12 @@ import { ProjectMember } from './ProjectMember';
 import { Deployment } from './Deployment';
 import { Deployer } from './Deployer';
 
+export enum AuctionStatus {
+  Commit = 'commit',
+  Reveal = 'reveal',
+  Completed = 'completed',
+}
+
 @Entity()
 export class Project {
   @PrimaryGeneratedColumn('uuid')
@@ -49,16 +55,23 @@ export class Project {
   @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))
+  @ManyToMany(() => Deployer, (deployer) => deployer.projects)
   @JoinTable()
-    deployers!: Deployer[]
+    deployers!: Deployer[];
+
+  @Column('varchar', { nullable: true })
+    auctionId!: string | null;
+
+  @Column({
+    enum: AuctionStatus,
+    // TODO: Remove later after all projects auction status have been set
+    default: AuctionStatus.Completed,
+  })
+    auctionStatus!: AuctionStatus;
 
   @Column('boolean', { default: false, nullable: true })
     fundsReleased!: boolean;

packages/backend/src/registry.ts

@@ -6,7 +6,13 @@ import { inc as semverInc } from 'semver';
 import { DeepPartial } from 'typeorm';
 import * as openpgp from 'openpgp';
 
-import { Account, DEFAULT_GAS_ESTIMATION_MULTIPLIER, Registry as LaconicRegistry, getGasPrice, parseGasAndFees } from '@cerc-io/registry-sdk';
+import {
+  Account,
+  DEFAULT_GAS_ESTIMATION_MULTIPLIER,
+  Registry as LaconicRegistry,
+  getGasPrice,
+  parseGasAndFees,
+} from '@cerc-io/registry-sdk';
 import { DeliverTxResponse, IndexedTx } from '@cosmjs/stargate';
 
 import { RegistryConfig } from './config';
@@ -14,17 +20,30 @@ import {
   ApplicationRecord,
   Deployment,
   ApplicationDeploymentRequest,
-  ApplicationDeploymentRemovalRequest
+  ApplicationDeploymentRemovalRequest,
 } from './entity/Deployment';
-import { AppDeploymentRecord, AppDeploymentRemovalRecord, AuctionParams, DeployerRecord, RegistryRecord } from './types';
+import {
-import { getConfig, getRepoDetails, registryTransactionWithRetry, sleep } from './utils';
+  AppDeploymentRecord,
+  AppDeploymentRemovalRecord,
+  AuctionParams,
+  DeployerRecord,
+  RegistryRecord,
+} from './types';
+import {
+  getConfig,
+  getRepoDetails,
+  registryTransactionWithRetry,
+  sleep,
+} from './utils';
+import { MsgCreateAuctionResponse } from '@cerc-io/registry-sdk/dist/proto/cerc/auction/v1/tx';
 
 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_REMOVAL_REQUEST_TYPE =
+  'ApplicationDeploymentRemovalRequest';
 const APP_DEPLOYMENT_RECORD_TYPE = 'ApplicationDeploymentRecord';
 const APP_DEPLOYMENT_REMOVAL_RECORD_TYPE = 'ApplicationDeploymentRemovalRecord';
 const WEBAPP_DEPLOYER_RECORD_TYPE = 'WebappDeployer';
@@ -43,7 +62,7 @@ export class Registry {
     this.registry = new LaconicRegistry(
       registryConfig.gqlEndpoint,
       registryConfig.restEndpoint,
-      { chainId: registryConfig.chainId, gasPrice }
+      { chainId: registryConfig.chainId, gasPrice },
     );
   }
 
@@ -53,7 +72,7 @@ export class Registry {
     commitHash,
     appType,
   }: {
-    octokit: Octokit
+    octokit: Octokit;
     repository: string;
     commitHash: string;
     appType: string;
@@ -61,29 +80,33 @@ export class Registry {
     applicationRecordId: string;
     applicationRecordData: ApplicationRecord;
   }> {
-    const { repo, repoUrl, packageJSON } = await getRepoDetails(octokit, repository, commitHash)
+    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(
       {
         type: APP_RECORD_TYPE,
-        name: packageJSON.name
+        name: packageJSON.name,
       },
-      true
+      true,
     );
 
     // Get next version of record
     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()
+        new Date(b.createTime).getTime() - new Date(a.createTime).getTime(),
     );
     const nextVersion = semverInc(
       latestBondRecord?.attributes.version ?? '0.0.0',
-      'patch'
+      'patch',
     );
 
     assert(nextVersion, 'Application record version not valid');
@@ -103,9 +126,9 @@ export class Registry {
         author:
           typeof packageJSON.author === 'object'
             ? JSON.stringify(packageJSON.author)
-            : packageJSON.author
+            : packageJSON.author,
       }),
-      ...(packageJSON.version && { app_version: packageJSON.version })
+      ...(packageJSON.version && { app_version: packageJSON.version }),
     };
 
     const result = await this.publishRecord(applicationRecord);
@@ -117,18 +140,9 @@ export class Registry {
     const lrn = this.getLrn(repo);
     log(`Setting name: ${lrn} for record ID: ${result.id}`);
 
-    const fee = parseGasAndFees(this.registryConfig.fee.gas, this.registryConfig.fee.fees);
+    const fee = parseGasAndFees(
-
+      this.registryConfig.fee.gas,
-    await sleep(SLEEP_DURATION);
+      this.registryConfig.fee.fees,
-    await registryTransactionWithRetry(() =>
-      this.registry.setName(
-        {
-          cid: result.id,
-          lrn
-        },
-        this.registryConfig.privateKey,
-        fee
-      )
     );
 
     await sleep(SLEEP_DURATION);
@@ -136,11 +150,11 @@ export class Registry {
       this.registry.setName(
         {
           cid: result.id,
-          lrn: `${lrn}@${applicationRecord.app_version}`
+          lrn,
         },
         this.registryConfig.privateKey,
-        fee
+        fee,
-      )
+      ),
     );
 
     await sleep(SLEEP_DURATION);
@@ -148,16 +162,28 @@ export class Registry {
       this.registry.setName(
         {
           cid: result.id,
-          lrn: `${lrn}@${applicationRecord.repository_ref}`
+          lrn: `${lrn}@${applicationRecord.app_version}`,
         },
         this.registryConfig.privateKey,
-        fee
+        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
+      applicationRecordData: applicationRecord,
     };
   }
 
@@ -167,7 +193,7 @@ export class Registry {
     auctionParams: AuctionParams,
     data: DeepPartial<Deployment>,
   ): Promise<{
-    applicationDeploymentAuctionId: string;
+    applicationDeploymentAuction: MsgCreateAuctionResponse['auction'];
   }> {
     assert(data.project?.repository, 'Project repository not found');
 
@@ -182,8 +208,11 @@ export class Registry {
     const config = await getConfig();
     const auctionConfig = config.auction;
 
-    const fee = parseGasAndFees(this.registryConfig.fee.gas, this.registryConfig.fee.fees);
+    const fee = parseGasAndFees(
-    const auctionResult = await registryTransactionWithRetry(() =>
+      this.registryConfig.fee.gas,
+      this.registryConfig.fee.fees,
+    );
+    const auctionResult = (await registryTransactionWithRetry(() =>
       this.registry.createProviderAuction(
         {
           commitFee: auctionConfig.commitFee,
@@ -195,9 +224,9 @@ export class Registry {
           numProviders: auctionParams.numProviders,
         },
         this.registryConfig.privateKey,
-        fee
+        fee,
-      )
+      ),
-    );
+    )) as MsgCreateAuctionResponse;
 
     if (!auctionResult.auction) {
       throw new Error('Error creating auction');
@@ -217,22 +246,22 @@ export class Registry {
     log('Application deployment auction data:', applicationDeploymentAuction);
 
     return {
-      applicationDeploymentAuctionId: auctionResult.auction.id,
+      applicationDeploymentAuction: auctionResult.auction!,
     };
   }
 
   async createApplicationDeploymentRequest(data: {
-    deployment: Deployment,
+    deployment: Deployment;
-    appName: string,
+    appName: string;
-    repository: string,
+    repository: string;
-    auctionId?: string | null,
+    auctionId?: string | null;
-    lrn: string,
+    lrn: string;
-    apiUrl: string,
+    apiUrl: string;
-    environmentVariables: { [key: string]: string },
+    environmentVariables: { [key: string]: string };
-    dns: string,
+    dns: string;
-    requesterAddress: string,
+    requesterAddress: string;
-    publicKey: string,
+    publicKey: string;
-    payment?: string | null
+    payment?: string | null;
   }): Promise<{
     applicationDeploymentRequestId: string;
     applicationDeploymentRequestData: ApplicationDeploymentRequest;
@@ -267,10 +296,10 @@ export class Registry {
       config: JSON.stringify(hash ? { ref: hash } : {}),
       meta: JSON.stringify({
         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.deployment.commitHash,
       }),
       deployer: data.lrn,
       ...(data.auctionId && { auction: data.auctionId }),
@@ -286,12 +315,12 @@ export class Registry {
 
     return {
       applicationDeploymentRequestId: result.id,
-      applicationDeploymentRequestData: applicationDeploymentRequest
+      applicationDeploymentRequestData: applicationDeploymentRequest,
     };
   }
 
   async getAuctionWinningDeployerRecords(
-    auctionId: string
+    auctionId: string,
   ): Promise<DeployerRecord[]> {
     const records = await this.registry.getAuctionsByIds([auctionId]);
     const auctionResult = records[0];
@@ -304,7 +333,7 @@ export class Registry {
         paymentAddress: auctionWinner,
       });
 
-      const newRecords = records.filter(record => {
+      const newRecords = records.filter((record) => {
         return record.names !== null && record.names.length > 0;
       });
 
@@ -319,18 +348,19 @@ export class Registry {
     return deployerRecords;
   }
 
-  async releaseDeployerFunds(
+  async releaseDeployerFunds(auctionId: string): Promise<any> {
-    auctionId: string
+    const fee = parseGasAndFees(
-  ): Promise<any> {
+      this.registryConfig.fee.gas,
-    const fee = parseGasAndFees(this.registryConfig.fee.gas, this.registryConfig.fee.fees);
+      this.registryConfig.fee.fees,
+    );
     const auction = await registryTransactionWithRetry(() =>
       this.registry.releaseFunds(
         {
-          auctionId
+          auctionId,
         },
         this.registryConfig.privateKey,
-        fee
+        fee,
-      )
+      ),
     );
 
     return auction;
@@ -340,49 +370,54 @@ export class Registry {
    * Fetch ApplicationDeploymentRecords for deployments
    */
   async getDeploymentRecords(
-    deployments: Deployment[]
+    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(
       {
-        type: APP_DEPLOYMENT_RECORD_TYPE
+        type: APP_DEPLOYMENT_RECORD_TYPE,
       },
-      true
+      true,
     );
 
     // Filter records with ApplicationDeploymentRequestId ID
     return records.filter((record: AppDeploymentRecord) =>
       deployments.some(
         (deployment) =>
-          deployment.applicationDeploymentRequestId === record.attributes.request
+          deployment.applicationDeploymentRequestId ===
-      )
+          record.attributes.request,
+      ),
     );
   }
 
   /**
    * Fetch WebappDeployer Records by filter
    */
-  async getDeployerRecordsByFilter(filter: { [key: string]: any }): Promise<DeployerRecord[]> {
+  async getDeployerRecordsByFilter(filter: {
+    [key: string]: any;
+  }): Promise<DeployerRecord[]> {
     return this.registry.queryRecords(
       {
         type: WEBAPP_DEPLOYER_RECORD_TYPE,
-        ...filter
+        ...filter,
       },
-      true
+      true,
     );
   }
 
   /**
    * Fetch ApplicationDeploymentRecords by filter
    */
-  async getDeploymentRecordsByFilter(filter: { [key: string]: any }): Promise<AppDeploymentRecord[]> {
+  async getDeploymentRecordsByFilter(filter: {
+    [key: string]: any;
+  }): Promise<AppDeploymentRecord[]> {
     return this.registry.queryRecords(
       {
         type: APP_DEPLOYMENT_RECORD_TYPE,
-        ...filter
+        ...filter,
       },
-      true
+      true,
     );
   }
 
@@ -390,29 +425,31 @@ export class Registry {
    * Fetch ApplicationDeploymentRemovalRecords for deployments
    */
   async getDeploymentRemovalRecords(
-    deployments: Deployment[]
+    deployments: Deployment[],
   ): Promise<AppDeploymentRemovalRecord[]> {
     // Fetch ApplicationDeploymentRemovalRecords for corresponding ApplicationDeploymentRecord set in deployments
     const records = await this.registry.queryRecords(
       {
-        type: APP_DEPLOYMENT_REMOVAL_RECORD_TYPE
+        type: APP_DEPLOYMENT_REMOVAL_RECORD_TYPE,
       },
-      true
+      true,
     );
 
     // Filter records with ApplicationDeploymentRecord and ApplicationDeploymentRemovalRequest IDs
     return records.filter((record: AppDeploymentRemovalRecord) =>
       deployments.some(
         (deployment) =>
-          deployment.applicationDeploymentRemovalRequestId === record.attributes.request &&
+          deployment.applicationDeploymentRemovalRequestId ===
-          deployment.applicationDeploymentRecordId === record.attributes.deployment
+            record.attributes.request &&
-      )
+          deployment.applicationDeploymentRecordId ===
+            record.attributes.deployment,
+      ),
     );
   }
 
   /**
- * Fetch record by Id
+   * Fetch record by Id
- */
+   */
   async getRecordById(id: string): Promise<RegistryRecord | null> {
     const [record] = await this.registry.getRecordsByIds([id]);
     return record ?? null;
@@ -440,12 +477,18 @@ export class Registry {
       applicationDeploymentRemovalRequest,
     );
 
-    log(`Application deployment removal request record published: ${result.id}`);
+    log(
-    log('Application deployment removal request data:', applicationDeploymentRemovalRequest);
+      `Application deployment removal request record published: ${result.id}`,
+    );
+    log(
+      'Application deployment removal request data:',
+      applicationDeploymentRemovalRequest,
+    );
 
     return {
       applicationDeploymentRemovalRequestId: result.id,
-      applicationDeploymentRemovalRequestData: applicationDeploymentRemovalRequest
+      applicationDeploymentRemovalRequestData:
+        applicationDeploymentRemovalRequest,
     };
   }
 
@@ -457,8 +500,11 @@ export class Registry {
     const auctions = await this.registry.getAuctionsByIds(auctionIds);
 
     const completedAuctions = auctions
-      .filter((auction: { id: string, status: string }) => auction.status === 'completed')
+      .filter(
-      .map((auction: { id: string, status: string }) => auction.id);
+        (auction: { id: string; status: string }) =>
+          auction.status === 'completed',
+      )
+      .map((auction: { id: string; status: string }) => auction.id);
 
     return completedAuctions;
   }
@@ -492,27 +538,38 @@ export class Registry {
     return this.registry.getAuctionsByIds([auctionId]);
   }
 
-  async sendTokensToAccount(receiverAddress: string, amount: string): Promise<DeliverTxResponse> {
+  async sendTokensToAccount(
-    const fee = parseGasAndFees(this.registryConfig.fee.gas, this.registryConfig.fee.fees);
+    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 =
+    const txResponse: DeliverTxResponse = await registryTransactionWithRetry(
-      await registryTransactionWithRetry(() =>
+      () =>
-        laconicClient.sendTokens(account.address, receiverAddress,
+        laconicClient.sendTokens(
+          account.address,
+          receiverAddress,
           [
             {
               denom: 'alnt',
-              amount
+              amount,
-            }
+            },
           ],
-          fee || DEFAULT_GAS_ESTIMATION_MULTIPLIER)
+          fee || DEFAULT_GAS_ESTIMATION_MULTIPLIER,
-      );
+        ),
+    );
 
     return txResponse;
   }
 
   async getAccount(): Promise<Account> {
-    const account = new Account(Buffer.from(this.registryConfig.privateKey, 'hex'));
+    const account = new Account(
+      Buffer.from(this.registryConfig.privateKey, 'hex'),
+    );
     await account.init();
 
     return account;

packages/backend/src/routes/auth.ts

@@ -94,13 +94,4 @@ router.get('/session', (req, res) => {
   }
 });
 
-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/service.ts

@@ -7,11 +7,16 @@ import { DateTime } from 'luxon';
 import { OAuthApp } from '@octokit/oauth-app';
 
 import { Database } from './database';
-import { ApplicationRecord, Deployment, DeploymentStatus, Environment } from './entity/Deployment';
+import {
+  ApplicationRecord,
+  Deployment,
+  DeploymentStatus,
+  Environment,
+} from './entity/Deployment';
 import { Domain } from './entity/Domain';
 import { EnvironmentVariable } from './entity/EnvironmentVariable';
 import { Organization } from './entity/Organization';
-import { Project } from './entity/Project';
+import { AuctionStatus, Project } from './entity/Project';
 import { Permission, ProjectMember } from './entity/ProjectMember';
 import { User } from './entity/User';
 import { Registry } from './registry';
@@ -119,7 +124,8 @@ export class Service {
       }
 
       // Fetch ApplicationDeploymentRecord for deployments
-      const records = await this.laconicRegistry.getDeploymentRecords(deployments);
+      const records =
+        await this.laconicRegistry.getDeploymentRecords(deployments);
       log(`Found ${records.length} ApplicationDeploymentRecords`);
 
       // Update deployments for which ApplicationDeploymentRecords were returned
@@ -204,7 +210,9 @@ export class Service {
         return;
       }
 
-      const registryRecord = await this.laconicRegistry.getRecordById(record.attributes.dns);
+      const registryRecord = await this.laconicRegistry.getRecordById(
+        record.attributes.dns,
+      );
 
       if (!registryRecord) {
         log(`DNS record not found for deployment ${deployment.id}`);
@@ -219,7 +227,7 @@ export class Service {
         resourceType: dnsRecord.attributes.resource_type,
         value: dnsRecord.attributes.value,
         version: dnsRecord.attributes.version,
-      }
+      };
 
       deployment.applicationDeploymentRecordId = record.id;
       deployment.applicationDeploymentRecordData = record.attributes;
@@ -239,18 +247,21 @@ export class Service {
           relations: {
             project: true,
             deployer: true,
-          }
+          },
         });
 
         if (previousCanonicalDeployment) {
           // Send removal request for the previous canonical deployment and delete DB entry
           if (previousCanonicalDeployment.url !== deployment.url) {
-            await this.laconicRegistry.createApplicationDeploymentRemovalRequest({
+            await this.laconicRegistry.createApplicationDeploymentRemovalRequest(
-              deploymentId: previousCanonicalDeployment.applicationDeploymentRecordId!,
+              {
-              deployerLrn: previousCanonicalDeployment.deployer.deployerLrn,
+                deploymentId:
-              auctionId: previousCanonicalDeployment.project.auctionId,
+                  previousCanonicalDeployment.applicationDeploymentRecordId!,
-              payment: previousCanonicalDeployment.project.txHash
+                deployerLrn: previousCanonicalDeployment.deployer.deployerLrn,
-            });
+                auctionId: previousCanonicalDeployment.project.auctionId,
+                payment: previousCanonicalDeployment.project.txHash,
+              },
+            );
           }
 
           await this.db.deleteDeploymentById(previousCanonicalDeployment.id);
@@ -261,7 +272,9 @@ export class Service {
 
       // Release deployer funds on successful deployment
       if (!deployment.project.fundsReleased) {
-        const fundsReleased = await this.releaseDeployerFundsByProjectId(deployment.projectId);
+        const fundsReleased = await this.releaseDeployerFundsByProjectId(
+          deployment.projectId,
+        );
 
         // Return remaining amount to owner
         await this.returnUserFundsByProjectId(deployment.projectId, true);
@@ -291,7 +304,7 @@ export class Service {
       const oldDeployments = projectDeployments.filter(
         (projectDeployment) =>
           projectDeployment.deployer.deployerLrn ===
-          deployment.deployer.deployerLrn &&
+            deployment.deployer.deployerLrn &&
           projectDeployment.id !== deployment.id &&
           projectDeployment.isCanonical == deployment.isCanonical,
       );
@@ -356,24 +369,30 @@ export class Service {
   async checkAuctionStatus(): Promise<void> {
     const projects = await this.db.allProjectsWithoutDeployments();
 
-    const validAuctionIds = projects.map((project) => project.auctionId)
+    const validAuctionIds = projects
+      .map((project) => project.auctionId)
       .filter((id): id is string => Boolean(id));
-    const completedAuctionIds = await this.laconicRegistry.getCompletedAuctionIds(validAuctionIds);
+    const completedAuctionIds =
+      await this.laconicRegistry.getCompletedAuctionIds(validAuctionIds);
 
     const projectsToBedeployed = projects.filter((project) =>
-      completedAuctionIds.includes(project.auctionId!)
+      completedAuctionIds.includes(project.auctionId!),
     );
 
     for (const project of projectsToBedeployed) {
-      const deployerRecords = await this.laconicRegistry.getAuctionWinningDeployerRecords(project!.auctionId!);
+      const deployerRecords =
+        await this.laconicRegistry.getAuctionWinningDeployerRecords(
+          project!.auctionId!,
+        );
 
       if (!deployerRecords) {
         log(`No winning deployer for auction ${project!.auctionId}`);
 
         // Return all funds to the owner
-        await this.returnUserFundsByProjectId(project.id, false)
+        await this.returnUserFundsByProjectId(project.id, false);
       } else {
-        const deployers = await this.saveDeployersByDeployerRecords(deployerRecords);
+        const deployers =
+          await this.saveDeployersByDeployerRecords(deployerRecords);
         for (const deployer of deployers) {
           log(`Creating deployment for deployer ${deployer.deployerLrn}`);
           await this.createDeploymentFromAuction(project, deployer);
@@ -381,6 +400,10 @@ export class Service {
           await this.updateProjectWithDeployer(project.id, deployer);
         }
       }
+
+      await this.updateProject(project.id, {
+        auctionStatus: AuctionStatus.Completed,
+      });
     }
 
     this.auctionStatusCheckTimeout = setTimeout(() => {
@@ -485,12 +508,17 @@ export class Service {
     return dbProjects;
   }
 
-  async getNonCanonicalDeploymentsByProjectId(projectId: string): Promise<Deployment[]> {
+  async getNonCanonicalDeploymentsByProjectId(
-    const nonCanonicalDeployments = await this.db.getNonCanonicalDeploymentsByProjectId(projectId);
+    projectId: string,
+  ): Promise<Deployment[]> {
+    const nonCanonicalDeployments =
+      await this.db.getNonCanonicalDeploymentsByProjectId(projectId);
     return nonCanonicalDeployments;
   }
 
-  async getLatestDNSRecordByProjectId(projectId: string): Promise<DNSRecordAttributes | null> {
+  async getLatestDNSRecordByProjectId(
+    projectId: string,
+  ): Promise<DNSRecordAttributes | null> {
     const dnsRecord = await this.db.getLatestDNSRecordByProjectId(projectId);
     return dnsRecord;
   }
@@ -650,7 +678,7 @@ export class Service {
       environment: Environment.Production,
       commitHash: oldDeployment.commitHash,
       commitMessage: oldDeployment.commitMessage,
-      deployer: oldDeployment.deployer
+      deployer: oldDeployment.deployer,
     });
 
     return newDeployment;
@@ -660,7 +688,7 @@ export class Service {
     userId: string,
     octokit: Octokit,
     data: DeepPartial<Deployment>,
-    deployerLrn?: string
+    deployerLrn?: string,
   ): Promise<Deployment> {
     assert(data.project?.repository, 'Project repository not found');
     log(
@@ -683,34 +711,58 @@ export class Service {
       deployer = data.deployer;
     }
 
-    const deployment = await this.createDeploymentFromData(userId, data, deployer!.deployerLrn!, applicationRecordId, applicationRecordData, false);
+    const deployment = await this.createDeploymentFromData(
+      userId,
+      data,
+      deployer!.deployerLrn!,
+      applicationRecordId,
+      applicationRecordData,
+      false,
+    );
 
     const address = await this.getAddress();
-    const { repo, repoUrl } = await getRepoDetails(octokit, data.project.repository, data.commitHash);
+    const { repo, repoUrl } = await getRepoDetails(
-    const environmentVariablesObj = await this.getEnvVariables(data.project!.id!);
+      octokit,
+      data.project.repository,
+      data.commitHash,
+    );
+    const environmentVariablesObj = await this.getEnvVariables(
+      data.project!.id!,
+    );
 
     // To set project DNS
     if (data.environment === Environment.Production) {
-      const canonicalDeployment = await this.createDeploymentFromData(userId, data, deployer!.deployerLrn!, applicationRecordId, applicationRecordData, true);
+      const canonicalDeployment = await this.createDeploymentFromData(
+        userId,
+        data,
+        deployer!.deployerLrn!,
+        applicationRecordId,
+        applicationRecordData,
+        true,
+      );
       // If a custom domain is present then use that as the DNS in the deployment request
-      const customDomain = await this.db.getOldestDomainByProjectId(data.project!.id!);
+      const customDomain = await this.db.getOldestDomainByProjectId(
+        data.project!.id!,
+      );
 
       // On deleting deployment later, project canonical deployment is also deleted
       // So publish project canonical deployment first so that ApplicationDeploymentRecord for the same is available when deleting deployment later
-      const { applicationDeploymentRequestData, applicationDeploymentRequestId } =
+      const {
-        await this.laconicRegistry.createApplicationDeploymentRequest({
+        applicationDeploymentRequestData,
-          deployment: canonicalDeployment,
+        applicationDeploymentRequestId,
-          appName: repo,
+      } = await this.laconicRegistry.createApplicationDeploymentRequest({
-          repository: repoUrl,
+        deployment: canonicalDeployment,
-          environmentVariables: environmentVariablesObj,
+        appName: repo,
-          dns: customDomain?.name ?? `${canonicalDeployment.project.name}`,
+        repository: repoUrl,
-          lrn: deployer!.deployerLrn!,
+        environmentVariables: environmentVariablesObj,
-          apiUrl: deployer!.deployerApiUrl!,
+        dns: customDomain?.name ?? `${canonicalDeployment.project.name}`,
-          payment: data.project.txHash,
+        lrn: deployer!.deployerLrn!,
-          auctionId: data.project.auctionId,
+        apiUrl: deployer!.deployerApiUrl!,
-          requesterAddress: address,
+        payment: data.project.txHash,
-          publicKey: deployer!.publicKey!
+        auctionId: data.project.auctionId,
-        });
+        requesterAddress: address,
+        publicKey: deployer!.publicKey!,
+      });
 
       await this.db.updateDeploymentById(canonicalDeployment.id, {
         applicationDeploymentRequestId,
@@ -730,7 +782,7 @@ export class Service {
         payment: data.project.txHash,
         auctionId: data.project.auctionId,
         requesterAddress: address,
-        publicKey: deployer!.publicKey!
+        publicKey: deployer!.publicKey!,
       });
 
     await this.db.updateDeploymentById(deployment.id, {
@@ -743,7 +795,7 @@ export class Service {
 
   async createDeploymentFromAuction(
     project: DeepPartial<Project>,
-    deployer: Deployer
+    deployer: Deployer,
   ): Promise<Deployment> {
     const octokit = await this.getOctokit(project.ownerId!);
     const [owner, repo] = project.repository!.split('/');
@@ -769,7 +821,7 @@ export class Service {
     const applicationRecordId = record.id;
     const applicationRecordData = record.attributes;
 
-    const deployerLrn = deployer!.deployerLrn
+    const deployerLrn = deployer!.deployerLrn;
 
     // Create deployment with prod branch and latest commit
     const deploymentData = {
@@ -781,31 +833,49 @@ export class Service {
       commitMessage: latestCommit.commit.message,
     };
 
-    const deployment = await this.createDeploymentFromData(project.ownerId!, deploymentData, deployerLrn, applicationRecordId, applicationRecordData, false);
+    const deployment = await this.createDeploymentFromData(
+      project.ownerId!,
+      deploymentData,
+      deployerLrn,
+      applicationRecordId,
+      applicationRecordData,
+      false,
+    );
     const address = await this.getAddress();
 
     const environmentVariablesObj = await this.getEnvVariables(project!.id!);
     // To set project DNS
     if (deploymentData.environment === Environment.Production) {
-      const canonicalDeployment = await this.createDeploymentFromData(project.ownerId!, deploymentData, deployerLrn, applicationRecordId, applicationRecordData, true);
+      const canonicalDeployment = await this.createDeploymentFromData(
+        project.ownerId!,
+        deploymentData,
+        deployerLrn,
+        applicationRecordId,
+        applicationRecordData,
+        true,
+      );
       // If a custom domain is present then use that as the DNS in the deployment request
-      const customDomain = await this.db.getOldestDomainByProjectId(project!.id!);
+      const customDomain = await this.db.getOldestDomainByProjectId(
+        project!.id!,
+      );
 
       // On deleting deployment later, project canonical deployment is also deleted
       // So publish project canonical deployment first so that ApplicationDeploymentRecord for the same is available when deleting deployment later
-      const { applicationDeploymentRequestId, applicationDeploymentRequestData } =
+      const {
-        await this.laconicRegistry.createApplicationDeploymentRequest({
+        applicationDeploymentRequestId,
-          deployment: canonicalDeployment,
+        applicationDeploymentRequestData,
-          appName: repo,
+      } = await this.laconicRegistry.createApplicationDeploymentRequest({
-          repository: repoUrl,
+        deployment: canonicalDeployment,
-          environmentVariables: environmentVariablesObj,
+        appName: repo,
-          dns: customDomain?.name ?? `${canonicalDeployment.project.name}`,
+        repository: repoUrl,
-          auctionId: project.auctionId!,
+        environmentVariables: environmentVariablesObj,
-          lrn: deployerLrn,
+        dns: customDomain?.name ?? `${canonicalDeployment.project.name}`,
-          apiUrl: deployer!.deployerApiUrl!,
+        auctionId: project.auctionId!,
-          requesterAddress: address,
+        lrn: deployerLrn,
-          publicKey: deployer!.publicKey!
+        apiUrl: deployer!.deployerApiUrl!,
-        });
+        requesterAddress: address,
+        publicKey: deployer!.publicKey!,
+      });
 
       await this.db.updateDeploymentById(canonicalDeployment.id, {
         applicationDeploymentRequestId,
@@ -825,7 +895,7 @@ export class Service {
         environmentVariables: environmentVariablesObj,
         dns: `${deployment.project.name}-${deployment.id}`,
         requesterAddress: address,
-        publicKey: deployer!.publicKey!
+        publicKey: deployer!.publicKey!,
       });
 
     await this.db.updateDeploymentById(deployment.id, {
@@ -859,7 +929,7 @@ export class Service {
       deployer: Object.assign(new Deployer(), {
         deployerLrn,
       }),
-      isCanonical
+      isCanonical,
     });
 
     log(`Created deployment ${newDeployment.id}`);
@@ -869,11 +939,11 @@ export class Service {
 
   async updateProjectWithDeployer(
     projectId: string,
-    deployer: Deployer
+    deployer: Deployer,
   ): Promise<Deployer> {
     const deploymentProject = await this.db.getProjects({
       where: { id: projectId },
-      relations: ['deployers']
+      relations: ['deployers'],
     });
 
     if (!deploymentProject[0].deployers) {
@@ -918,15 +988,22 @@ export class Service {
 
       const prodBranch = createdTemplateRepo.data.default_branch ?? 'main';
 
-      const project = await this.addProject(user, organizationSlug, {
+      const project = await this.addProject(
-        name: `${gitRepo.data.owner!.login}-${gitRepo.data.name}`,
+        user,
-        prodBranch,
+        organizationSlug,
-        repository: gitRepo.data.full_name,
+        {
-        // TODO: Set selected template
+          name: `${gitRepo.data.owner!.login}-${gitRepo.data.name}`,
-        template: 'webapp',
+          prodBranch,
-        paymentAddress: data.paymentAddress,
+          repository: gitRepo.data.full_name,
-        txHash: data.txHash
+          // TODO: Set selected template
-      }, lrn, auctionParams, environmentVariables);
+          template: 'webapp',
+          paymentAddress: data.paymentAddress,
+          txHash: data.txHash,
+        },
+        lrn,
+        auctionParams,
+        environmentVariables,
+      );
 
       if (!project || !project.id) {
         throw new Error('Failed to create project from template');
@@ -985,8 +1062,19 @@ export class Service {
         commitHash: latestCommit.sha,
         commitMessage: latestCommit.commit.message,
       };
-      const { applicationDeploymentAuctionId } = await this.laconicRegistry.createApplicationDeploymentAuction(repo, octokit, auctionParams!, deploymentData);
+
-      await this.updateProject(project.id, { auctionId: applicationDeploymentAuctionId });
+      const { applicationDeploymentAuction } =
+        await this.laconicRegistry.createApplicationDeploymentAuction(
+          repo,
+          octokit,
+          auctionParams!,
+          deploymentData,
+        );
+
+      await this.updateProject(project.id, {
+        auctionId: applicationDeploymentAuction!.id,
+        auctionStatus: applicationDeploymentAuction!.status as AuctionStatus,
+      });
     } else {
       const deployer = await this.db.getDeployerByLRN(lrn!);
 
@@ -996,11 +1084,13 @@ export class Service {
       }
 
       if (deployer.minimumPayment && project.txHash) {
-        const amountToBePaid = deployer?.minimumPayment.replace(/\D/g, '').toString();
+        const amountToBePaid = deployer?.minimumPayment
+          .replace(/\D/g, '')
+          .toString();
 
         const txResponse = await this.laconicRegistry.sendTokensToAccount(
           deployer?.paymentAddress!,
-          amountToBePaid
+          amountToBePaid,
         );
 
         const txHash = txResponse.transactionHash;
@@ -1018,12 +1108,19 @@ export class Service {
         domain: null,
         commitHash: latestCommit.sha,
         commitMessage: latestCommit.commit.message,
-        deployer
+        deployer,
       };
 
-      const newDeployment = await this.createDeployment(user.id, octokit, deploymentData);
+      const newDeployment = await this.createDeployment(
+        user.id,
+        octokit,
+        deploymentData,
+      );
       // Update project with deployer
-      await this.updateProjectWithDeployer(newDeployment.projectId, newDeployment.deployer);
+      await this.updateProjectWithDeployer(
+        newDeployment.projectId,
+        newDeployment.deployer,
+      );
     }
 
     await this.createRepoHook(octokit, project);
@@ -1079,7 +1176,7 @@ export class Service {
       where: { repository: repository.full_name },
       relations: {
         deployers: true,
-      }
+      },
     });
 
     if (!projects.length) {
@@ -1095,25 +1192,23 @@ export class Service {
 
       const deployers = project.deployers;
       if (!deployers) {
-        log(`No deployer present for project ${project.id}`)
+        log(`No deployer present for project ${project.id}`);
         return;
       }
 
       for (const deployer of deployers) {
         // Create deployment with branch and latest commit in GitHub data
-        await this.createDeployment(project.ownerId, octokit,
+        await this.createDeployment(project.ownerId, octokit, {
-          {
+          project,
-            project,
+          branch,
-            branch,
+          environment:
-            environment:
+            project.prodBranch === branch
-              project.prodBranch === branch
+              ? Environment.Production
-                ? Environment.Production
+              : Environment.Preview,
-                : Environment.Preview,
+          commitHash: headCommit.id,
-            commitHash: headCommit.id,
+          commitMessage: headCommit.message,
-            commitMessage: headCommit.message,
+          deployer: deployer,
-            deployer: deployer
+        });
-          },
-        );
       }
     }
   }
@@ -1167,19 +1262,20 @@ export class Service {
     let newDeployment: Deployment;
 
     if (oldDeployment.project.auctionId) {
-      newDeployment = await this.createDeploymentFromAuction(oldDeployment.project, oldDeployment.deployer);
+      newDeployment = await this.createDeploymentFromAuction(
-    } else {
+        oldDeployment.project,
-      newDeployment = await this.createDeployment(user.id, octokit,
+        oldDeployment.deployer,
-        {
-          project: oldDeployment.project,
-          // TODO: Put isCurrent field in project
-          branch: oldDeployment.branch,
-          environment: Environment.Production,
-          commitHash: oldDeployment.commitHash,
-          commitMessage: oldDeployment.commitMessage,
-          deployer: oldDeployment.deployer
-        }
       );
+    } else {
+      newDeployment = await this.createDeployment(user.id, octokit, {
+        project: oldDeployment.project,
+        // TODO: Put isCurrent field in project
+        branch: oldDeployment.branch,
+        environment: Environment.Production,
+        commitHash: oldDeployment.commitHash,
+        commitMessage: oldDeployment.commitMessage,
+        deployer: oldDeployment.deployer,
+      });
     }
 
     return newDeployment;
@@ -1218,22 +1314,26 @@ export class Service {
       { isCurrent: true },
     );
 
-    if (!newCurrentDeploymentUpdate || !oldCurrentDeploymentUpdate){
+    if (!newCurrentDeploymentUpdate || !oldCurrentDeploymentUpdate) {
       return false;
     }
 
-    const newCurrentDeployment = await this.db.getDeployment({ where: { id: deploymentId }, relations: { project: true, deployer: true } });
+    const newCurrentDeployment = await this.db.getDeployment({
+      where: { id: deploymentId },
+      relations: { project: true, deployer: true },
+    });
 
     if (!newCurrentDeployment) {
       throw new Error(`Deployment with Id ${deploymentId} not found`);
     }
 
-    const applicationDeploymentRequestData = newCurrentDeployment.applicationDeploymentRequestData;
+    const applicationDeploymentRequestData =
+      newCurrentDeployment.applicationDeploymentRequestData;
 
     const customDomain = await this.db.getOldestDomainByProjectId(projectId);
 
     if (customDomain && applicationDeploymentRequestData) {
-      applicationDeploymentRequestData.dns = customDomain.name
+      applicationDeploymentRequestData.dns = customDomain.name;
     }
 
     // Create a canonical deployment for the new current deployment
@@ -1249,20 +1349,23 @@ export class Service {
     applicationDeploymentRequestData!.meta = JSON.stringify({
       ...JSON.parse(applicationDeploymentRequestData!.meta),
       note: `Updated by Snowball @ ${DateTime.utc().toFormat(
-        "EEE LLL dd HH:mm:ss 'UTC' yyyy"
+        "EEE LLL dd HH:mm:ss 'UTC' yyyy",
-      )}`
+      )}`,
     });
 
     const result = await this.laconicRegistry.publishRecord(
       applicationDeploymentRequestData,
     );
 
-    log(`Application deployment request record published: ${result.id}`)
+    log(`Application deployment request record published: ${result.id}`);
 
-    const updateResult = await this.db.updateDeploymentById(canonicalDeployment.id, {
+    const updateResult = await this.db.updateDeploymentById(
-      applicationDeploymentRequestId: result.id,
+      canonicalDeployment.id,
-      applicationDeploymentRequestData,
+      {
-    });
+        applicationDeploymentRequestId: result.id,
+        applicationDeploymentRequestData,
+      },
+    );
 
     return updateResult;
   }
@@ -1285,18 +1388,20 @@ export class Service {
           where: {
             projectId: deployment.project.id,
             deployer: deployment.deployer,
-            isCanonical: true
+            isCanonical: true,
           },
           relations: {
             project: true,
             deployer: true,
           },
-        })
+        });
 
         // If the canonical deployment is not present then query the chain for the deployment record for backward compatibility
         if (!canonicalDeployment) {
-          log(`Canonical deployment for deployment with id ${deployment.id} not found, querying the chain..`);
+          log(
-          const currentDeploymentURL = `https://${(deployment.project.name).toLowerCase()}.${deployment.deployer.baseDomain}`;
+            `Canonical deployment for deployment with id ${deployment.id} not found, querying the chain..`,
+          );
+          const currentDeploymentURL = `https://${deployment.project.name.toLowerCase()}.${deployment.deployer.baseDomain}`;
 
           const deploymentRecords =
             await this.laconicRegistry.getDeploymentRecordsByFilter({
@@ -1313,24 +1418,30 @@ export class Service {
           }
 
           // Multiple records are fetched, take the latest record
-          const latestRecord = deploymentRecords
+          const latestRecord = deploymentRecords.sort(
-            .sort((a, b) => new Date(b.createTime).getTime() - new Date(a.createTime).getTime())[0];
+            (a, b) =>
+              new Date(b.createTime).getTime() -
+              new Date(a.createTime).getTime(),
+          )[0];
 
           await this.laconicRegistry.createApplicationDeploymentRemovalRequest({
             deploymentId: latestRecord.id,
             deployerLrn: deployment.deployer.deployerLrn,
             auctionId: deployment.project.auctionId,
-            payment: deployment.project.txHash
+            payment: deployment.project.txHash,
           });
         } else {
           // If canonical deployment is found in the DB, then send the removal request with that deployment record Id
           const result =
-            await this.laconicRegistry.createApplicationDeploymentRemovalRequest({
+            await this.laconicRegistry.createApplicationDeploymentRemovalRequest(
-              deploymentId: canonicalDeployment.applicationDeploymentRecordId!,
+              {
-              deployerLrn: canonicalDeployment.deployer.deployerLrn,
+                deploymentId:
-              auctionId: canonicalDeployment.project.auctionId,
+                  canonicalDeployment.applicationDeploymentRecordId!,
-              payment: canonicalDeployment.project.txHash
+                deployerLrn: canonicalDeployment.deployer.deployerLrn,
-            });
+                auctionId: canonicalDeployment.project.auctionId,
+                payment: canonicalDeployment.project.txHash,
+              },
+            );
 
           await this.db.updateDeploymentById(canonicalDeployment.id, {
             status: DeploymentStatus.Deleting,
@@ -1347,7 +1458,7 @@ export class Service {
           deploymentId: deployment.applicationDeploymentRecordId,
           deployerLrn: deployment.deployer.deployerLrn,
           auctionId: deployment.project.auctionId,
-          payment: deployment.project.txHash
+          payment: deployment.project.txHash,
         });
 
       await this.db.updateDeploymentById(deployment.id, {
@@ -1483,12 +1594,11 @@ export class Service {
     return this.db.updateUser(user, data);
   }
 
-  async getEnvVariables(
+  async getEnvVariables(projectId: string): Promise<{ [key: string]: string }> {
-    projectId: string,
+    const environmentVariables =
-  ): Promise<{ [key: string]: string }> {
+      await this.db.getEnvironmentVariablesByProjectId(projectId, {
-    const environmentVariables = await this.db.getEnvironmentVariablesByProjectId(projectId, {
+        environment: Environment.Production,
-      environment: Environment.Production,
+      });
-    });
 
     const environmentVariablesObj = environmentVariables.reduce(
       (acc, env) => {
@@ -1501,9 +1611,7 @@ export class Service {
     return environmentVariablesObj;
   }
 
-  async getAuctionData(
+  async getAuctionData(auctionId: string): Promise<any> {
-    auctionId: string
-  ): Promise<any> {
     const auctions = await this.laconicRegistry.getAuctionData(auctionId);
     return auctions[0];
   }
@@ -1512,16 +1620,19 @@ export class Service {
     const project = await this.db.getProjectById(projectId);
 
     if (!project || !project.auctionId) {
-      log(`Project ${projectId} ${!project ? 'not found' : 'does not have an auction'}`);
+      log(
+        `Project ${projectId} ${!project ? 'not found' : 'does not have an auction'}`,
+      );
 
       return false;
     }
 
-    const auction = await this.laconicRegistry.releaseDeployerFunds(project.auctionId);
+    const auction = await this.laconicRegistry.releaseDeployerFunds(
+      project.auctionId,
+    );
 
     if (auction.auction.fundsReleased) {
       log(`Funds released for auction ${project.auctionId}`);
-      await this.db.updateProjectById(projectId, { fundsReleased: true });
 
       return true;
     }
@@ -1531,21 +1642,29 @@ export class Service {
     return false;
   }
 
-  async returnUserFundsByProjectId(projectId: string, winningDeployersPresent: boolean) {
+  async returnUserFundsByProjectId(
+    projectId: string,
+    winningDeployersPresent: boolean,
+  ) {
     const project = await this.db.getProjectById(projectId);
 
     if (!project || !project.auctionId) {
-      log(`Project ${projectId} ${!project ? 'not found' : 'does not have an auction'}`);
+      log(
+        `Project ${projectId} ${!project ? 'not found' : 'does not have an auction'}`,
+      );
 
       return false;
     }
 
     const auction = await this.getAuctionData(project.auctionId);
-    const totalAuctionPrice = Number(auction.maxPrice.quantity) * auction.numProviders;
+    const totalAuctionPrice =
+      Number(auction.maxPrice.quantity) * auction.numProviders;
 
     let amountToBeReturned;
     if (winningDeployersPresent) {
-      amountToBeReturned = totalAuctionPrice - auction.winnerAddresses.length * Number(auction.winnerPrice.quantity);
+      amountToBeReturned =
+        totalAuctionPrice -
+        auction.winnerAddresses.length * Number(auction.winnerPrice.quantity);
     } else {
       amountToBeReturned = totalAuctionPrice;
     }
@@ -1553,7 +1672,7 @@ export class Service {
     if (amountToBeReturned !== 0) {
       await this.laconicRegistry.sendTokensToAccount(
         project.paymentAddress,
-        amountToBeReturned.toString()
+        amountToBeReturned.toString(),
       );
     }
   }
@@ -1572,13 +1691,16 @@ export class Service {
   }
 
   async updateDeployersFromRegistry(): Promise<Deployer[]> {
-    const deployerRecords = await this.laconicRegistry.getDeployerRecordsByFilter({});
+    const deployerRecords =
+      await this.laconicRegistry.getDeployerRecordsByFilter({});
     await this.saveDeployersByDeployerRecords(deployerRecords);
 
     return await this.db.getDeployers();
   }
 
-  async saveDeployersByDeployerRecords(deployerRecords: DeployerRecord[]): Promise<Deployer[]> {
+  async saveDeployersByDeployerRecords(
+    deployerRecords: DeployerRecord[],
+  ): Promise<Deployer[]> {
     const deployers: Deployer[] = [];
 
     for (const record of deployerRecords) {
@@ -1589,7 +1711,9 @@ export class Service {
         const minimumPayment = record.attributes.minimumPayment;
         const paymentAddress = record.attributes.paymentAddress;
         const publicKey = record.attributes.publicKey;
-        const baseDomain = deployerApiUrl.substring(deployerApiUrl.indexOf('.') + 1);
+        const baseDomain = deployerApiUrl.substring(
+          deployerApiUrl.indexOf('.') + 1,
+        );
 
         const deployerData = {
           deployerLrn,
@@ -1598,7 +1722,7 @@ export class Service {
           baseDomain,
           minimumPayment,
           paymentAddress,
-          publicKey
+          publicKey,
         };
 
         // TODO: Update deployers table in a separate job
@@ -1616,25 +1740,39 @@ export class Service {
     return account.address;
   }
 
-  async verifyTx(txHash: string, amountSent: string, senderAddress: string): Promise<boolean> {
+  async verifyTx(
+    txHash: string,
+    amountSent: string,
+    senderAddress: string,
+  ): Promise<boolean> {
     const txResponse = await this.laconicRegistry.getTxResponse(txHash);
     if (!txResponse) {
       log('Transaction response not found');
       return false;
     }
 
-    const transfer = txResponse.events.find(e => e.type === 'transfer' && e.attributes.some(a => a.key === 'msg_index'));
+    const transfer = txResponse.events.find(
+      (e) =>
+        e.type === 'transfer' &&
+        e.attributes.some((a) => a.key === 'msg_index'),
+    );
     if (!transfer) {
       log('No transfer event found');
       return false;
     }
 
-    const sender = transfer.attributes.find(a => a.key === 'sender')?.value;
+    const sender = transfer.attributes.find((a) => a.key === 'sender')?.value;
-    const recipient = transfer.attributes.find(a => a.key === 'recipient')?.value;
+    const recipient = transfer.attributes.find(
-    const amount = transfer.attributes.find(a => a.key === 'amount')?.value;
+      (a) => a.key === 'recipient',
+    )?.value;
+    const amount = transfer.attributes.find((a) => a.key === 'amount')?.value;
 
     const recipientAddress = await this.getAddress();
 
-    return amount === amountSent && sender === senderAddress && recipient === recipientAddress;
+    return (
+      amount === amountSent &&
+      sender === senderAddress &&
+      recipient === recipientAddress
+    );
   }
 }

packages/deployer/config.yml

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

packages/deployer/deploy-frontend.sh

@@ -133,8 +133,6 @@ record:
       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

packages/deployer/deploy-frontend.vaasl.sh

@@ -127,7 +127,6 @@ record:
       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

packages/frontend/.env.example

@@ -5,8 +5,6 @@ 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=
@@ -14,5 +12,4 @@ VITE_BUGSNAG_API_KEY=
 VITE_PASSKEY_WALLET_RPID=
 VITE_TURNKEY_API_BASE_URL=
 
-VITE_LACONICD_CHAIN_ID=
 VITE_WALLET_IFRAME_URL=

packages/frontend/package.json

@@ -41,13 +41,12 @@
     "@turnkey/http": "^2.10.0",
     "@turnkey/sdk-react": "^0.1.0",
     "@turnkey/webauthn-stamper": "^0.5.0",
-    "@walletconnect/ethereum-provider": "^2.16.1",
     "@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",
+    "ethers": "^5.6.2",
     "downshift": "^8.3.2",
     "framer-motion": "^11.0.8",
     "gql-client": "^1.0.0",
@@ -69,7 +68,6 @@
     "usehooks-ts": "^2.15.1",
     "uuid": "^9.0.1",
     "viem": "^2.7.11",
-    "wagmi": "2.5.7",
     "web-vitals": "^2.1.4"
   },
   "devDependencies": {

packages/frontend/public/network.json

@@ -0,0 +1,11 @@
+{
+  "chainId": "laconic-mainnet",
+  "networkName": "laconicd mainnet",
+  "namespace": "cosmos",
+  "rpcUrl": "https://laconicd-mainnet-1.laconic.com",
+  "blockExplorerUrl": "",
+  "nativeDenom": "alnt",
+  "addressPrefix": "laconic",
+  "coinType": 118,
+  "gasPrice": 0.001
+}

packages/frontend/src/App.tsx

@@ -11,8 +11,8 @@ import ProjectSearchLayout from './layouts/ProjectSearch';
 import Index from './pages';
 import AuthPage from './pages/AuthPage';
 import { DashboardLayout } from './pages/org-slug/layout';
-import Web3Provider from 'context/Web3Provider';
 import { BASE_URL } from 'utils/constants';
+import BuyPrepaidService from './pages/BuyPrepaidService';
 
 const router = createBrowserRouter([
   {
@@ -50,6 +50,10 @@ const router = createBrowserRouter([
     path: '/login',
     element: <AuthPage />,
   },
+  {
+    path: '/buy-prepaid-service',
+    element: <BuyPrepaidService />,
+  },
 ]);
 
 function App() {
@@ -75,9 +79,7 @@ function App() {
   }, []);
 
   return (
-    <Web3Provider>
+    <RouterProvider router={router} />
-      <RouterProvider router={router} />
-    </Web3Provider>
   );
 }
 

packages/frontend/src/components/projects/create/AccountsDropdown.tsx

@@ -1,60 +0,0 @@
-import {
-  Select,
-  Option,
-  Spinner,
-} from '@snowballtools/material-tailwind-react-fork';
-
-const AccountsDropdown = ({
-  accounts,
-  isDataReceived,
-  onAccountChange,
-}: {
-  accounts: string[];
-  isDataReceived: boolean;
-  onAccountChange: (selectedAccount: string) => void;
-}) => {
-  return (
-    <div className="p-6 bg-slate-100 dark:bg-overlay3 rounded-lg mb-6 shadow-md">
-      {isDataReceived ? (
-        !accounts.length ? (
-          <div className="text-center">
-            <p className="text-gray-700 dark:text-gray-300 mb-4">
-              No accounts found. Please visit{' '}
-              <a
-                href="https://store.laconic.com"
-                target="_blank"
-                rel="noopener noreferrer"
-                className="text-blue-600 underline dark:text-blue-400"
-              >
-                store.laconic.com
-              </a>{' '}
-              to create a wallet.
-            </p>
-          </div>
-        ) : (
-          <div>
-            <Select
-              label="Select Account"
-              defaultValue={accounts[0]}
-              onChange={(value) => value && onAccountChange(value)}
-              className="dark:bg-overlay2 dark:text-foreground"
-              aria-label="Wallet Account Selector"
-            >
-              {accounts.map((account, index) => (
-                <Option key={index} value={account}>
-                  {account}
-                </Option>
-              ))}
-            </Select>
-          </div>
-        )
-      ) : (
-        <div className="flex items-center justify-center h-12">
-          <Spinner className="h-6 w-6" />
-        </div>
-      )}
-    </div>
-  );
-};
-
-export default AccountsDropdown;

packages/frontend/src/components/projects/create/ApproveTransactionModal.tsx

@@ -3,27 +3,38 @@ import { useCallback, useEffect } from 'react';
 import { Box, Modal } from '@mui/material';
 
 import {
-  VITE_LACONICD_CHAIN_ID,
   VITE_WALLET_IFRAME_URL,
 } from 'utils/constants';
+import { REQUEST_WALLET_ACCOUNTS, WALLET_ACCOUNTS_DATA } from '../../../constants';
+import { useAddNetwork } from '../../../hooks/useAddNetwork';
 
-const IFrameModal = ({
+const ApproveTransactionModal = ({
-  setAccounts,
+  setAccount,
   setIsDataReceived,
   isVisible,
 }: {
-  setAccounts: (accounts: string[]) => void;
+  setAccount: (account: string) => void;
   setIsDataReceived: (isReceived: boolean) => void;
   isVisible: boolean;
 }) => {
+  const { setIframe, isNetworkAvailable, networkData } = useAddNetwork();
+
   useEffect(() => {
     const handleMessage = (event: MessageEvent) => {
       if (event.origin !== VITE_WALLET_IFRAME_URL) return;
 
-      setIsDataReceived(true);
+      if (event.data.type === WALLET_ACCOUNTS_DATA) {
-      if (event.data.type === 'WALLET_ACCOUNTS_DATA') {
+        setIsDataReceived(true);
-        setAccounts(event.data.data);
+
-      } else if (event.data.type === 'ERROR') {
+        if (event.data.data.length === 0) {
+          console.error(`Accounts not present for chainId: ${networkData?.chainId}`);
+          return;
+        }
+
+        setAccount(event.data.data[0]);
+      }
+
+      if (event.data.type === 'ERROR') {
         console.error('Error from wallet:', event.data.message);
       }
     };
@@ -33,9 +44,14 @@ const IFrameModal = ({
     return () => {
       window.removeEventListener('message', handleMessage);
     };
-  }, []);
+  }, [networkData]);
 
   const getDataFromWallet = useCallback(() => {
+    if (!networkData) {
+      console.error('networkData should not be empty');
+      return;
+    }
+
     const iframe = document.getElementById('walletIframe') as HTMLIFrameElement;
 
     if (!iframe.contentWindow) {
@@ -45,12 +61,18 @@ const IFrameModal = ({
 
     iframe.contentWindow.postMessage(
       {
-        type: 'REQUEST_WALLET_ACCOUNTS',
+        type: REQUEST_WALLET_ACCOUNTS,
-        chainId: VITE_LACONICD_CHAIN_ID,
+        chainId: networkData.chainId,
       },
       VITE_WALLET_IFRAME_URL,
     );
-  }, []);
+  }, [networkData]);
+
+  useEffect(() => {
+    if (isNetworkAvailable) {
+      getDataFromWallet();
+    }
+  }, [isNetworkAvailable, getDataFromWallet])
 
   return (
     <Modal open={isVisible} disableEscapeKeyDown keepMounted>
@@ -72,7 +94,7 @@ const IFrameModal = ({
         }}
       >
         <iframe
-          onLoad={getDataFromWallet}
+          onLoad={(event) => setIframe(event.target as HTMLIFrameElement)}
           id="walletIframe"
           src={`${VITE_WALLET_IFRAME_URL}/wallet-embed`}
           width="100%"
@@ -85,4 +107,4 @@ const IFrameModal = ({
   );
 };
 
-export default IFrameModal;
+export default ApproveTransactionModal;

packages/frontend/src/components/projects/create/CheckBalanceIframe.tsx

@@ -0,0 +1,67 @@
+import { useEffect } from 'react';
+
+import { Modal } from '@mui/material';
+
+import { VITE_WALLET_IFRAME_URL } from 'utils/constants';
+import useCheckBalance from '../../../hooks/useCheckBalance';
+import { useAddNetwork } from '../../../hooks/useAddNetwork';
+
+const CHECK_BALANCE_INTERVAL = 5000;
+const IFRAME_ID = 'checkBalanceIframe';
+
+const CheckBalanceIframe = ({
+  onBalanceChange,
+  isPollingEnabled,
+  amount,
+}: {
+  onBalanceChange: (value: boolean | undefined) => void;
+  isPollingEnabled: boolean;
+  amount: string;
+}) => {
+  const { isBalanceSufficient, checkBalance } = useCheckBalance(
+    amount,
+    IFRAME_ID,
+  );
+
+  const { isNetworkAvailable, setIframe } = useAddNetwork();
+  
+  useEffect(() => {
+    if (!isNetworkAvailable || isBalanceSufficient) {
+      return;
+    }
+
+    checkBalance();
+
+    if (!isPollingEnabled) {
+      return;
+    }
+    
+    const interval = setInterval(() => {
+      checkBalance();
+    }, CHECK_BALANCE_INTERVAL);
+
+    return () => {
+      clearInterval(interval);
+    };
+  }, [isBalanceSufficient, isPollingEnabled, checkBalance, isNetworkAvailable]);
+
+  useEffect(() => {
+    onBalanceChange(isBalanceSufficient);
+  }, [isBalanceSufficient]);
+
+  return (
+    <Modal open={false} disableEscapeKeyDown keepMounted>
+      <iframe
+        onLoad={(event) => setIframe(event.target as HTMLIFrameElement)}
+        id={IFRAME_ID}
+        src={VITE_WALLET_IFRAME_URL}
+        width="100%"
+        height="100%"
+        sandbox="allow-scripts allow-same-origin"
+        className="border rounded-md shadow-sm"
+      />
+    </Modal>
+  );
+};
+
+export default CheckBalanceIframe;

packages/frontend/src/components/projects/create/Configure.tsx

@@ -1,4 +1,4 @@
-import { useCallback, useState, useEffect } from 'react';
+import { useCallback, useState, useEffect, useMemo } from 'react';
 import { useForm, Controller } from 'react-hook-form';
 import { FormProvider, FieldValues } from 'react-hook-form';
 import { useNavigate, useSearchParams } from 'react-router-dom';
@@ -8,6 +8,7 @@ import {
   AuctionParams,
   Deployer,
 } from 'gql-client';
+import { BigNumber } from 'ethers';
 
 import { Select, MenuItem, FormControl, FormHelperText } from '@mui/material';
 
@@ -20,19 +21,19 @@ import { Button } from '../../shared/Button';
 import { Input } from 'components/shared/Input';
 import { useToast } from 'components/shared/Toast';
 import { useGQLClient } from '../../../context/GQLClientContext';
-import IFrameModal from './IFrameModal';
+import ApproveTransactionModal from './ApproveTransactionModal';
 import EnvironmentVariablesForm from 'pages/org-slug/projects/id/settings/EnvironmentVariablesForm';
 import { EnvironmentVariablesFormValues } from 'types/types';
 import {
-  VITE_LACONICD_CHAIN_ID,
   VITE_WALLET_IFRAME_URL,
 } from 'utils/constants';
-import AccountsDropdown from './AccountsDropdown';
+import CheckBalanceIframe from './CheckBalanceIframe';
+import { useAddNetwork } from '../../../hooks/useAddNetwork';
 
 type ConfigureDeploymentFormValues = {
   option: string;
   lrn?: string;
-  numProviders?: number;
+  numProviders?: string;
   maxPrice?: string;
 };
 
@@ -46,12 +47,13 @@ const Configure = () => {
   const [isLoading, setIsLoading] = useState(false);
   const [deployers, setDeployers] = useState<Deployer[]>([]);
   const [selectedAccount, setSelectedAccount] = useState<string>();
-  const [accounts, setAccounts] = useState<string[]>([]);
   const [selectedDeployer, setSelectedDeployer] = useState<Deployer>();
   const [isPaymentLoading, setIsPaymentLoading] = useState(false);
   const [isPaymentDone, setIsPaymentDone] = useState(false);
   const [isFrameVisible, setIsFrameVisible] = useState(false);
   const [isAccountsDataReceived, setIsAccountsDataReceived] = useState(false);
+  const [balanceMessage, setBalanceMessage] = useState<string>();
+  const [isBalanceSufficient, setIsBalanceSufficient] = useState<boolean>();
 
   const [searchParams] = useSearchParams();
   const templateId = searchParams.get('templateId');
@@ -69,22 +71,47 @@ const Configure = () => {
   const navigate = useNavigate();
   const { toast, dismiss } = useToast();
   const client = useGQLClient();
+  const { networkData } = useAddNetwork()
 
   const methods = useForm<ConfigureFormValues>({
     defaultValues: {
       option: 'Auction',
       maxPrice: DEFAULT_MAX_PRICE,
       lrn: '',
-      numProviders: 1,
+      numProviders: '1',
       variables: [],
     },
   });
 
   const selectedOption = methods.watch('option');
+  const selectedNumProviders = methods.watch('numProviders') ?? '1';
+  const selectedMaxPrice = methods.watch('maxPrice') ?? DEFAULT_MAX_PRICE;
 
   const isTabletView = useMediaQuery('(min-width: 720px)'); // md:
   const buttonSize = isTabletView ? { size: 'lg' as const } : {};
 
+  const amountToBePaid = useMemo(() => {
+    let amount: string;
+
+    if (selectedOption === 'LRN') {
+      amount = selectedDeployer?.minimumPayment?.replace(/\D/g, '') ?? '0';
+    } else {
+      if (!selectedNumProviders || !selectedMaxPrice) {
+        return '';
+      }
+
+      const bigMaxPrice = BigNumber.from(selectedMaxPrice);
+      amount = bigMaxPrice.mul(selectedNumProviders).toString();
+    }
+
+    return amount;
+  }, [
+    selectedOption,
+    selectedDeployer?.minimumPayment,
+    selectedMaxPrice,
+    selectedNumProviders,
+  ]);
+
   const createProject = async (
     data: FieldValues,
     envVariables: AddEnvironmentVariableInput[],
@@ -186,7 +213,6 @@ const Configure = () => {
           (deployer) => deployer.deployerLrn === deployerLrn,
         );
 
-        let amount: string;
         let senderAddress: string;
         let txHash: string | null = null;
         if (createFormData.option === 'LRN' && !deployer?.minimumPayment) {
@@ -204,16 +230,6 @@ const Configure = () => {
 
           senderAddress = selectedAccount;
 
-          if (createFormData.option === 'LRN') {
-            amount = deployer?.minimumPayment!;
-          } else {
-            amount = (
-              createFormData.numProviders * createFormData.maxPrice
-            ).toString();
-          }
-
-          const amountToBePaid = amount.replace(/\D/g, '').toString();
-
           txHash = await cosmosSendTokensHandler(senderAddress, amountToBePaid);
 
           if (!txHash) {
@@ -303,7 +319,7 @@ const Configure = () => {
         throw new Error(error);
       }
     },
-    [client, createProject, dismiss, toast],
+    [client, createProject, dismiss, toast, amountToBePaid],
   );
 
   const fetchDeployers = useCallback(async () => {
@@ -311,10 +327,6 @@ const Configure = () => {
     setDeployers(res.deployers);
   }, [client]);
 
-  const onAccountChange = useCallback((account: string) => {
-    setSelectedAccount(account);
-  }, []);
-
   const onDeployerChange = useCallback(
     (selectedLrn: string) => {
       const deployer = deployers.find((d) => d.deployerLrn === selectedLrn);
@@ -340,12 +352,20 @@ const Configure = () => {
         await requestTx(senderAddress, snowballAddress, amount);
 
         const txHash = await new Promise<string | null>((resolve, reject) => {
+          // Call cleanup method only if appropriate event type is recieved
+          const cleanup = () => {
+            setIsFrameVisible(false);
+            window.removeEventListener('message', handleTxStatus);
+          };
+
           const handleTxStatus = async (event: MessageEvent) => {
             if (event.origin !== VITE_WALLET_IFRAME_URL) return;
 
             if (event.data.type === 'TRANSACTION_RESPONSE') {
               const txResponse = event.data.data;
               resolve(txResponse);
+
+              cleanup();
             } else if (event.data.type === 'ERROR') {
               console.error('Error from wallet:', event.data.message);
               reject(new Error('Transaction failed'));
@@ -355,10 +375,9 @@ const Configure = () => {
                 variant: 'error',
                 onDismiss: dismiss,
               });
-            }
-            setIsFrameVisible(false);
 
-            window.removeEventListener('message', handleTxStatus);
+              cleanup();
+            }
           };
 
           window.addEventListener('message', handleTxStatus);
@@ -403,7 +422,7 @@ const Configure = () => {
     iframe.contentWindow.postMessage(
       {
         type: 'REQUEST_TX',
-        chainId: VITE_LACONICD_CHAIN_ID,
+        chainId: networkData?.chainId,
         fromAddress: sender,
         toAddress: recipient,
         amount,
@@ -418,6 +437,12 @@ const Configure = () => {
     fetchDeployers();
   }, []);
 
+  useEffect(() => {
+    if (isBalanceSufficient) {
+      setBalanceMessage(undefined);
+    }
+  }, [isBalanceSufficient]);
+
   return (
     <div className="space-y-7 px-4 py-6">
       <div className="flex justify-between mb-6">
@@ -534,6 +559,7 @@ const Configure = () => {
                         type="number"
                         value={value}
                         onChange={(e) => onChange(e)}
+                        min={1}
                       />
                     )}
                   />
@@ -547,7 +573,7 @@ const Configure = () => {
                     control={methods.control}
                     rules={{ required: true }}
                     render={({ field: { value, onChange } }) => (
-                      <Input type="number" value={value} onChange={onChange} />
+                      <Input type="number" value={value} onChange={onChange} min={1} />
                     )}
                   />
                 </div>
@@ -579,49 +605,83 @@ const Configure = () => {
                 </Button>
               </div>
             ) : (
-              <>
+              <div className="flex gap-4">
-                <AccountsDropdown
+                <Button
-                  accounts={accounts}
+                  {...buttonSize}
-                  onAccountChange={onAccountChange}
+                  type="submit"
-                  isDataReceived={isAccountsDataReceived}
+                  shape="default"
-                />
+                  disabled={
-                {accounts.length > 0 && (
+                    isLoading ||
-                  <div>
+                    isPaymentLoading ||
-                    <Button
+                    !selectedAccount ||
-                      {...buttonSize}
+                    !isBalanceSufficient ||
-                      type="submit"
+                    amountToBePaid === '' ||
-                      shape="default"
+                    selectedNumProviders === ''
-                      disabled={
+                  }
-                        isLoading || isPaymentLoading || !selectedAccount
+                  rightIcon={
-                      }
+                    isLoading || isPaymentLoading ? (
-                      rightIcon={
+                      <LoadingIcon className="animate-spin" />
-                        isLoading || isPaymentLoading ? (
+                    ) : (
-                          <LoadingIcon className="animate-spin" />
+                      <ArrowRightCircleFilledIcon />
+                    )
+                  }
+                >
+                  {!isPaymentDone
+                    ? isPaymentLoading
+                      ? 'Transaction Requested'
+                      : 'Pay and Deploy'
+                    : isLoading
+                      ? 'Deploying'
+                      : 'Deploy'}
+                </Button>
+                {isAccountsDataReceived && isBalanceSufficient !== undefined ? (
+                  !selectedAccount || !isBalanceSufficient ? (
+                    <div className="flex items-center gap-4">
+                      <Button
+                        {...buttonSize}
+                        shape="default"
+                        onClick={(e: any) => {
+                          e.preventDefault();
+                          setBalanceMessage('Waiting for payment');
+                          window.open(
+                            'https://store.laconic.com',
+                            '_blank',
+                            'noopener,noreferrer',
+                          );
+                        }}
+                      >
+                        Buy prepaid service
+                      </Button>
+                      <p className="text-gray-700 dark:text-gray-300">
+                        {balanceMessage !== undefined ? (
+                          <div className="flex items-center gap-2 text-white">
+                            <LoadingIcon className="animate-spin w-5 h-5" />
+                            <p>{balanceMessage}</p>
+                          </div>
+                        ) : !selectedAccount ? (
+                          'No accounts found. Create a wallet.'
                         ) : (
-                          <ArrowRightCircleFilledIcon />
+                          'Insufficient funds.'
-                        )
+                        )}
-                      }
+                      </p>
-                    >
+                    </div>
-                      {!isPaymentDone
+                  ) : null
-                        ? isPaymentLoading
+                ) : null}
-                          ? 'Transaction Requested'
+              </div>
-                          : 'Pay and Deploy'
-                        : isLoading
-                          ? 'Deploying'
-                          : 'Deploy'}
-                    </Button>
-                  </div>
-                )}
-              </>
             )}
           </form>
         </FormProvider>
 
-        <IFrameModal
+        <ApproveTransactionModal
-          setAccounts={setAccounts}
+          setAccount={setSelectedAccount}
           setIsDataReceived={setIsAccountsDataReceived}
           isVisible={isFrameVisible}
         />
+        <CheckBalanceIframe
+          onBalanceChange={setIsBalanceSufficient}
+          amount={amountToBePaid}
+          isPollingEnabled={true}
+        />
       </div>
     </div>
   );

packages/frontend/src/components/projects/project/overview/Activity/AuctionCard.tsx

@@ -43,6 +43,11 @@ export const AuctionCard = ({ project }: { project: Project }) => {
 
   const checkAuctionStatus = useCallback(async () => {
     const result = await client.getAuctionData(project.auctionId);
+
+    if (!result) {
+      return
+    }
+
     setAuctionStatus(result.status);
     setAuctionDetails(result);
   }, [project.auctionId, project.deployers, project.fundsReleased]);

packages/frontend/src/components/shared/Sidebar/Sidebar.tsx

@@ -1,14 +1,11 @@
 import { useCallback, useEffect, useState } from 'react';
-import { useNavigate, useParams } from 'react-router-dom';
+import { useParams } from 'react-router-dom';
 import { User } from 'gql-client';
 import { motion } from 'framer-motion';
-import { useDisconnect } from 'wagmi';
 
 import { useGQLClient } from 'context/GQLClientContext';
 import {
-  GlobeIcon,
   LifeBuoyIcon,
-  LogoutIcon,
   QuestionMarkRoundIcon,
 } from 'components/shared/CustomIcon';
 import { Tabs } from 'components/shared/Tabs';
@@ -16,10 +13,9 @@ import { Logo } from 'components/Logo';
 import { Avatar } from 'components/shared/Avatar';
 import { formatAddress } from 'utils/format';
 import { getInitials } from 'utils/geInitials';
-import { Button } from 'components/shared/Button';
 import { cn } from 'utils/classnames';
 import { useMediaQuery } from 'usehooks-ts';
-import { BASE_URL } from 'utils/constants';
+import { SHOPIFY_APP_URL } from '../../../constants';
 
 interface SidebarProps {
   mobileOpen?: boolean;
@@ -27,12 +23,10 @@ interface SidebarProps {
 
 export const Sidebar = ({ mobileOpen }: SidebarProps) => {
   const { orgSlug } = useParams();
-  const navigate = useNavigate();
   const client = useGQLClient();
   const isDesktop = useMediaQuery('(min-width: 960px)');
 
   const [user, setUser] = useState<User>();
-  const { disconnect } = useDisconnect();
 
   const fetchUser = useCallback(async () => {
     const { user } = await client.getUser();
@@ -43,16 +37,6 @@ export const Sidebar = ({ mobileOpen }: SidebarProps) => {
     fetchUser();
   }, []);
 
-  const handleLogOut = useCallback(async () => {
-    await fetch(`${BASE_URL}/auth/logout`, {
-      method: 'POST',
-      credentials: 'include',
-    });
-    localStorage.clear();
-    disconnect();
-    navigate('/login');
-  }, [disconnect, navigate]);
-
   return (
     <motion.nav
       initial={{ x: -320 }}
@@ -82,19 +66,10 @@ export const Sidebar = ({ mobileOpen }: SidebarProps) => {
           <Tabs defaultValue="Projects" orientation="vertical">
             {/* // TODO: use proper link buttons */}
             <Tabs.List>
-              <Tabs.Trigger
-                icon={<GlobeIcon />}
-                value=""
-                className="hidden lg:flex"
-              >
-                <a className="cursor-pointer font-mono" onClick={handleLogOut}>
-                  LOG OUT
-                </a>
-              </Tabs.Trigger>
               <Tabs.Trigger icon={<QuestionMarkRoundIcon />} value="">
                 <a
                   className="cursor-pointer font-mono"
-                  href="https://store.laconic.com/pages/instruction-faq"
+                  href={`${SHOPIFY_APP_URL}/pages/instruction-faq`}
                 >
                   DOCUMENTATION
                 </a>
@@ -125,14 +100,6 @@ export const Sidebar = ({ mobileOpen }: SidebarProps) => {
             </p>
           </div>
         )}
-        <Button
-          iconOnly
-          variant="ghost"
-          className="text-elements-low-em"
-          onClick={handleLogOut}
-        >
-          <LogoutIcon />
-        </Button>
       </div>
     </motion.nav>
   );

packages/frontend/src/components/shared/auth/AutoSignInIFrameModal.tsx

@@ -0,0 +1,155 @@
+import { useCallback, useEffect, useState } from 'react';
+import { generateNonce, SiweMessage } from 'siwe';
+import axios from 'axios';
+import { useNavigate } from 'react-router-dom';
+
+import { Box, Modal } from '@mui/material';
+
+import { BASE_URL, VITE_WALLET_IFRAME_URL } from 'utils/constants';
+import { REQUEST_CREATE_OR_GET_ACCOUNTS, WALLET_ACCOUNTS_DATA } from '../../../constants';
+
+const axiosInstance = axios.create({
+  baseURL: BASE_URL,
+  headers: {
+    'Content-Type': 'application/json',
+    'Access-Control-Allow-Origin': '*',
+  },
+  withCredentials: true,
+});
+
+const AutoSignInIFrameModal = () => {
+  const navigate = useNavigate();
+
+  const [accountAddress, setAccountAddress] = useState();
+
+  useEffect(() => {
+    const handleSignInResponse = async (event: MessageEvent) => {
+      if (event.origin !== VITE_WALLET_IFRAME_URL) return;
+
+      if (event.data.type === 'SIGN_IN_RESPONSE') {
+        try {
+          const { success } = (
+            await axiosInstance.post('/auth/validate', {
+              message: event.data.data.message,
+              signature: event.data.data.signature,
+            })
+          ).data;
+
+          if (success === true) {
+            navigate('/');
+          }
+        } catch (error) {
+          console.error('Error signing in:', error);
+        }
+      }
+    };
+
+    window.addEventListener('message', handleSignInResponse);
+
+    return () => {
+      window.removeEventListener('message', handleSignInResponse);
+    };
+  }, []);
+
+  useEffect(() => {
+    const initiateAutoSignIn = async () => {
+      if (!accountAddress) return;
+
+      const iframe = document.getElementById(
+        'autoSignInFrame',
+      ) as HTMLIFrameElement;
+
+      if (!iframe.contentWindow) {
+        console.error('Iframe not found or not loaded');
+        return;
+      }
+
+      const message = new SiweMessage({
+        version: '1',
+        domain: window.location.host,
+        uri: window.location.origin,
+        chainId: 1,
+        address: accountAddress,
+        nonce: generateNonce(),
+        // Human-readable ASCII assertion that the user will sign, and it must not contain `\n`.
+        statement: 'Sign in With Ethereum.',
+      }).prepareMessage();
+
+      iframe.contentWindow.postMessage(
+        {
+          type: 'AUTO_SIGN_IN',
+          chainId: '1',
+          message,
+        },
+        VITE_WALLET_IFRAME_URL,
+      );
+    };
+
+    initiateAutoSignIn();
+  }, [accountAddress]);
+
+  useEffect(() => {
+    const handleAccountsDataResponse = async (event: MessageEvent) => {
+      if (event.origin !== VITE_WALLET_IFRAME_URL) return;
+
+      if (event.data.type === WALLET_ACCOUNTS_DATA) {
+        setAccountAddress(event.data.data[0]);
+      }
+    };
+
+    window.addEventListener('message', handleAccountsDataResponse);
+
+    return () => {
+      window.removeEventListener('message', handleAccountsDataResponse);
+    };
+  }, []);
+
+  const getAddressFromWallet = useCallback(() => {
+    const iframe = document.getElementById(
+      'autoSignInFrame',
+    ) as HTMLIFrameElement;
+
+    if (!iframe.contentWindow) {
+      console.error('Iframe not found or not loaded');
+      return;
+    }
+
+    iframe.contentWindow.postMessage(
+      {
+        type: REQUEST_CREATE_OR_GET_ACCOUNTS,
+        chainId: '1',
+      },
+      VITE_WALLET_IFRAME_URL,
+    );
+  }, []);
+
+  return (
+    <Modal open={true} disableEscapeKeyDown keepMounted>
+      <Box
+        sx={{
+          position: 'absolute',
+          top: '50%',
+          left: '50%',
+          transform: 'translate(-50%, -50%)',
+          width: '90%',
+          maxWidth: '1200px',
+          height: '600px',
+          maxHeight: '80vh',
+          overflow: 'auto',
+          outline: 'none',
+        }}
+      >
+        <iframe
+          onLoad={getAddressFromWallet}
+          id="autoSignInFrame"
+          src={`${VITE_WALLET_IFRAME_URL}/auto-sign-in`}
+          width="100%"
+          height="100%"
+          sandbox="allow-scripts allow-same-origin"
+        ></iframe>
+      </Box>
+    </Modal>
+  );
+};
+
+export default AutoSignInIFrameModal;

packages/frontend/src/constants.ts

@@ -1,3 +1,16 @@
 export const SHORT_COMMIT_HASH_LENGTH = 8;
 
 export const SERVER_GQL_PATH = 'graphql';
+
+export const SHOPIFY_APP_URL = 'https://store.laconic.com';
+
+// iframe request types
+export const REQUEST_CREATE_OR_GET_ACCOUNTS = 'REQUEST_CREATE_OR_GET_ACCOUNTS';
+export const REQUEST_ADD_NETWORK = 'REQUEST_ADD_NETWORK';
+export const REQUEST_WALLET_ACCOUNTS = 'REQUEST_WALLET_ACCOUNTS';
+
+// iframe response types
+export const WALLET_ACCOUNTS_DATA = 'WALLET_ACCOUNTS_DATA';
+export const NETWORK_ADDED_RESPONSE = "NETWORK_ADDED_RESPONSE";
+export const NETWORK_ALREADY_EXISTS_RESPONSE = "NETWORK_ALREADY_EXISTS_RESPONSE";
+export const NETWORK_ADD_FAILED_RESPONSE = "NETWORK_ADD_FAILED_RESPONSE";

packages/frontend/src/context/Web3Provider.tsx

@@ -1,116 +0,0 @@
-import { ReactNode } from 'react';
-import assert from 'assert';
-import { SiweMessage, generateNonce } from 'siwe';
-import { WagmiProvider } from 'wagmi';
-import { mainnet } from 'wagmi/chains';
-import axios from 'axios';
-
-import { createWeb3Modal } from '@web3modal/wagmi/react';
-import { defaultWagmiConfig } from '@web3modal/wagmi/react/config';
-import { createSIWEConfig } from '@web3modal/siwe';
-import type {
-  SIWECreateMessageArgs,
-  SIWEVerifyMessageArgs,
-} from '@web3modal/core';
-import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-
-import { VITE_WALLET_CONNECT_ID, BASE_URL } from 'utils/constants';
-
-if (!VITE_WALLET_CONNECT_ID) {
-  throw new Error('Error: VITE_WALLET_CONNECT_ID env config is not set');
-}
-assert(BASE_URL, 'VITE_SERVER_URL is not set in env');
-
-const queryClient = new QueryClient();
-const axiosInstance = axios.create({
-  baseURL: BASE_URL,
-  headers: {
-    'Content-Type': 'application/json',
-    'Access-Control-Allow-Origin': '*',
-  },
-  withCredentials: true,
-});
-const metadata = {
-  name: 'Deploy App Auth',
-  description: '',
-  url: window.location.origin,
-  icons: ['https://avatars.githubusercontent.com/u/37784886'],
-};
-const chains = [mainnet] as const;
-const config = defaultWagmiConfig({
-  chains,
-  projectId: VITE_WALLET_CONNECT_ID,
-  metadata,
-});
-const siweConfig = createSIWEConfig({
-  createMessage: ({ nonce, address, chainId }: SIWECreateMessageArgs) =>
-    new SiweMessage({
-      version: '1',
-      domain: window.location.host,
-      uri: window.location.origin,
-      address,
-      chainId,
-      nonce,
-      // Human-readable ASCII assertion that the user will sign, and it must not contain `\n`.
-      statement: 'Sign in With Ethereum.',
-    }).prepareMessage(),
-  getNonce: async () => {
-    return generateNonce();
-  },
-  getSession: async () => {
-    try {
-      const session = (await axiosInstance.get('/auth/session')).data;
-      const { address, chainId } = session;
-      return { address, chainId };
-    } catch (err) {
-      if (window.location.pathname !== '/login') {
-        window.location.href = '/login';
-      }
-      throw new Error('Failed to get session!');
-    }
-  },
-  verifyMessage: async ({ message, signature }: SIWEVerifyMessageArgs) => {
-    try {
-      const { success } = (
-        await axiosInstance.post('/auth/validate', {
-          message,
-          signature,
-        })
-      ).data;
-      return success;
-    } catch (error) {
-      return false;
-    }
-  },
-  signOut: async () => {
-    try {
-      const { success } = (await axiosInstance.post('/auth/logout')).data;
-      return success;
-    } catch (error) {
-      return false;
-    }
-  },
-  onSignOut: () => {
-    window.location.href = '/login';
-  },
-  onSignIn: () => {
-    window.location.href = '/';
-  },
-});
-
-createWeb3Modal({
-  siweConfig,
-  wagmiConfig: config,
-  projectId: VITE_WALLET_CONNECT_ID,
-});
-export default function Web3ModalProvider({
-  children,
-}: {
-  children: ReactNode;
-}) {
-  return (
-    <WagmiProvider config={config}>
-      <QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
-    </WagmiProvider>
-  );
-}

packages/frontend/src/hooks/useAddNetwork.ts

@@ -0,0 +1,92 @@
+import { useState, useEffect } from 'react';
+import { VITE_WALLET_IFRAME_URL } from 'utils/constants';
+import { NETWORK_ADD_FAILED_RESPONSE, NETWORK_ADDED_RESPONSE, NETWORK_ALREADY_EXISTS_RESPONSE, REQUEST_ADD_NETWORK } from '../constants';
+
+interface NetworkData {
+  chainId: string;
+  namespace: string;
+  networkName: string;
+  rpcUrl: string;
+  coinType: string;
+  addressPrefix?: string;
+  blockExplorerUrl?: string;
+  nativeDenom?: string;
+  gasPrice?: string;
+}
+
+export const useAddNetwork = () => {
+  const [networkData, setNetworkData] = useState<NetworkData | null>(null);
+  const [iframe, setIframe] = useState<HTMLIFrameElement | null>(null);
+  const [isNetworkAvailable, setIsNetworkAvailable] = useState(false);
+
+  // useEffect to add network in embedded wallet
+  useEffect(() => {
+    if (!networkData) {
+      return;
+    }
+
+    if (!iframe?.contentWindow) {
+      return;
+    }
+
+    iframe.contentWindow.postMessage(
+      {
+        type: REQUEST_ADD_NETWORK,
+        chainId: networkData.chainId,
+        networkData,
+      },
+      VITE_WALLET_IFRAME_URL,
+    );
+  }, [networkData, iframe]);
+
+  // useEffect to listen for network add reponses
+  useEffect(() => {
+    const handleMessage = (event: MessageEvent) => {
+      if (event.origin !== VITE_WALLET_IFRAME_URL) return;
+
+      switch (event.data.type) {
+        case NETWORK_ADDED_RESPONSE:
+        case NETWORK_ALREADY_EXISTS_RESPONSE:
+          // Once network is available, set state
+          setIsNetworkAvailable(true);
+          break;
+
+        case NETWORK_ADD_FAILED_RESPONSE:
+          setIsNetworkAvailable(false);
+          console.error("Network could not be added:", event.data.message);
+          break;
+
+        default:
+          break;
+      }
+    };
+
+    window.addEventListener('message', handleMessage);
+
+    return () => {
+      window.removeEventListener('message', handleMessage);
+    };
+  }, []);
+
+  useEffect(() => {
+    const loadNetworkData = async () => {
+      try {
+        const res = await fetch('/network.json');
+        const json = await res.json();
+
+        setNetworkData(json);
+      } catch (err) {
+        console.error('Failed to load network data:', err);
+      }
+    };
+
+    loadNetworkData();
+  }, []);
+
+  return {
+    networkData,
+    isNetworkAvailable,
+    iframe,
+    setIframe
+  };
+};

packages/frontend/src/hooks/useCheckBalance.tsx

@@ -0,0 +1,50 @@
+import { useState, useEffect, useCallback } from 'react';
+
+import { useAddNetwork } from './useAddNetwork';
+
+const useCheckBalance = (amount: string, iframeId: string) => {
+  const [isBalanceSufficient, setIsBalanceSufficient] = useState<boolean>();
+
+  const { networkData } = useAddNetwork()
+
+  const checkBalance = useCallback(() => {
+    if (!networkData) {
+      return;
+    }
+
+    const iframe = document.getElementById(iframeId) as HTMLIFrameElement;
+
+    if (!iframe || !iframe.contentWindow) {
+      console.error(`Iframe with ID "${iframeId}" not found or not loaded`);
+      return;
+    }
+
+    iframe.contentWindow.postMessage(
+      {
+        type: 'CHECK_BALANCE',
+        chainId: networkData.chainId,
+        amount,
+      },
+      import.meta.env.VITE_WALLET_IFRAME_URL
+    );
+  }, [iframeId, amount, networkData]);
+
+  useEffect(() => {
+    const handleMessage = (event: MessageEvent) => {
+      if (event.origin !== import.meta.env.VITE_WALLET_IFRAME_URL) return;
+
+      if (event.data.type !== 'IS_SUFFICIENT') return;
+
+      setIsBalanceSufficient(event.data.data);
+    };
+
+    window.addEventListener('message', handleMessage);
+    return () => {
+      window.removeEventListener('message', handleMessage);
+    };
+  }, []);
+
+  return { isBalanceSufficient, checkBalance };
+};
+
+export default useCheckBalance;

packages/frontend/src/index.tsx

@@ -14,7 +14,6 @@ import { SERVER_GQL_PATH } from './constants';
 import { Toaster } from 'components/shared/Toast';
 import { LogErrorBoundary } from 'utils/log-error';
 import { BASE_URL } from 'utils/constants';
-import Web3ModalProvider from './context/Web3Provider';
 import './index.css';
 
 console.log(`v-0.0.9`);
@@ -32,12 +31,10 @@ root.render(
   <LogErrorBoundary>
     <React.StrictMode>
       <ThemeProvider>
-        <Web3ModalProvider>
+        <GQLClientProvider client={gqlClient}>
-          <GQLClientProvider client={gqlClient}>
+          <App />
-            <App />
+          <Toaster />
-            <Toaster />
+        </GQLClientProvider>
-          </GQLClientProvider>
-        </Web3ModalProvider>
       </ThemeProvider>
     </React.StrictMode>
   </LogErrorBoundary>,

packages/frontend/src/pages/AuthPage.tsx

@@ -1,4 +1,4 @@
-import { Login } from './auth/Login';
+import AutoSignInIFrameModal from 'components/shared/auth/AutoSignInIFrameModal';
 
 const AuthPage = () => {
   return (
@@ -13,9 +13,7 @@ const AuthPage = () => {
         </div>
       </div>
       <div className="pb-12 relative z-10 flex-1 flex-center">
-        <div className="max-w-[520px] w-full dark:bg-overlay bg-white rounded-xl shadow">
+        <AutoSignInIFrameModal />
-          <Login />
-        </div>
       </div>
     </div>
   );

packages/frontend/src/pages/BuyPrepaidService.tsx

@@ -0,0 +1,38 @@
+import { useEffect, useState } from 'react';
+import { useNavigate } from 'react-router-dom';
+import { useMediaQuery } from 'usehooks-ts';
+
+import { Button } from 'components/shared';
+import CheckBalanceIframe from 'components/projects/create/CheckBalanceIframe';
+import { SHOPIFY_APP_URL } from '../constants';
+
+const BuyPrepaidService = () => {
+  const navigate = useNavigate();
+
+  const [isBalanceSufficient, setIsBalanceSufficient] = useState<boolean>();
+
+  const isTabletView = useMediaQuery('(min-width: 720px)'); // md:
+  const buttonSize = isTabletView ? { size: 'lg' as const } : {};
+
+  useEffect(() => {
+    if (isBalanceSufficient === true) {
+      navigate('/');
+    }
+  }, [isBalanceSufficient]);
+
+  return (
+    <div className="dark:bg-background flex flex-col min-h-screen">
+      <div className="pb-12 relative z-10 flex-1 flex-center">
+        <Button {...buttonSize} shape={'default'}>
+          <a href={SHOPIFY_APP_URL} target="_blank">
+            Buy prepaid service
+          </a>
+        </Button>
+      </div>
+
+      <CheckBalanceIframe onBalanceChange={setIsBalanceSufficient} isPollingEnabled={true} amount='1'/>
+    </div>
+  );
+};
+
+export default BuyPrepaidService;

packages/frontend/src/pages/auth/Login.tsx

@@ -9,12 +9,6 @@ export const Login = () => {
         </div>
       </div>
       <WavyBorder className="self-stretch" variant="stroke" />
-
-      <div className="self-stretch p-4 xs:p-6 flex-col justify-center items-center gap-8 flex">
-        <div className="self-stretch flex-col justify-center  items-center gap-3 flex">
-          <w3m-button />
-        </div>
-      </div>
     </div>
   );
 };

packages/frontend/src/pages/org-slug/index.tsx

@@ -1,16 +1,20 @@
 import { useCallback, useEffect, useState } from 'react';
-import { Link, useParams } from 'react-router-dom';
+import { Link, useNavigate, useParams } from 'react-router-dom';
 
 import { ProjectCard } from 'components/projects/ProjectCard';
 import { Heading, Badge, Button } from 'components/shared';
 import { PlusIcon } from 'components/shared/CustomIcon';
 import { useGQLClient } from 'context/GQLClientContext';
 import { Project } from 'gql-client';
+import CheckBalanceIframe from 'components/projects/create/CheckBalanceIframe';
 
 const Projects = () => {
+  const [isBalanceSufficient, setIsBalanceSufficient] = useState<boolean>();
+  const [projects, setProjects] = useState<Project[]>([]);
+
+  const navigate = useNavigate();
   const client = useGQLClient();
   const { orgSlug } = useParams();
-  const [projects, setProjects] = useState<Project[]>([]);
 
   const fetchProjects = useCallback(async () => {
     const { projectsInOrganization } = await client.getProjectsInOrganization(
@@ -23,6 +27,12 @@ const Projects = () => {
     fetchProjects();
   }, [orgSlug]);
 
+  useEffect(() => {
+    if (isBalanceSufficient === false) {
+      navigate('/buy-prepaid-service');
+    }
+  }, [isBalanceSufficient]);
+
   return (
     <section className="px-4 md:px-6 py-6 flex flex-col gap-6">
       {/* Header */}
@@ -49,6 +59,8 @@ const Projects = () => {
             return <ProjectCard project={project} key={key} />;
           })}
       </div>
+
+      <CheckBalanceIframe onBalanceChange={setIsBalanceSufficient} isPollingEnabled={false} amount='1' />
     </section>
   );
 };

packages/frontend/src/pages/org-slug/projects/id/Overview.tsx

@@ -204,7 +204,7 @@ const OverviewTabPanel = () => {
               {project.deployments &&
                 project.deployments.length > 0 &&
                 project.deployments.map((deployment) => (
-                  <div className="flex gap-2 items-center">
+                  <div key={deployment.id} className="flex gap-2 items-center">
                     <Link to={deployment.applicationDeploymentRecordData.url}>
                       <span className="text-controls-primary dark:text-foreground group hover:border-controls-primary transition-colors border-b border-b-transparent flex gap-2 items-center text-sm tracking-tight">
                         {deployment.applicationDeploymentRecordData.url}

packages/frontend/src/utils/constants.ts

@@ -8,8 +8,6 @@ export const VITE_GITHUB_IMAGE_UPLOAD_PWA_TEMPLATE_REPO = import.meta.env
 export const VITE_GITHUB_NEXT_APP_TEMPLATE_REPO = import.meta.env
   .VITE_GITHUB_NEXT_APP_TEMPLATE_REPO;
 export const VITE_GITHUB_CLIENT_ID = import.meta.env.VITE_GITHUB_CLIENT_ID;
-export const VITE_WALLET_CONNECT_ID = import.meta.env.VITE_WALLET_CONNECT_ID;
 export const VITE_BUGSNAG_API_KEY = import.meta.env.VITE_BUGSNAG_API_KEY;
 export const VITE_LIT_RELAY_API_KEY = import.meta.env.VITE_LIT_RELAY_API_KEY;
-export const VITE_LACONICD_CHAIN_ID = import.meta.env.VITE_LACONICD_CHAIN_ID;
 export const VITE_WALLET_IFRAME_URL = import.meta.env.VITE_WALLET_IFRAME_URL;

packages/frontend/src/utils/web3modal.ts

@@ -1,8 +0,0 @@
-import { WalletConnectModal } from '@walletconnect/modal';
-
-import { VITE_WALLET_CONNECT_ID } from 'utils/constants';
-
-export const walletConnectModal = new WalletConnectModal({
-  projectId: VITE_WALLET_CONNECT_ID,
-  chains: [],
-});

packages/gql-client/src/client.ts

@@ -414,14 +414,25 @@ export class GQLClient {
     return data;
   }
 
-  async getAuctionData(auctionId: string): Promise<types.Auction> {
+  async getAuctionData(auctionId: string): Promise<types.Auction | null> {
-    const { data } = await this.client.query({
+    const { data, errors } = await this.client.query({
       query: queries.getAuctionData,
       variables: {
         auctionId,
       },
     });
 
+
+    if (errors && errors.length) {
+      const isAuctionNotFound = errors.some((error) =>
+        error.message?.includes('Auction not found')
+      );
+
+      if (isAuctionNotFound) {
+        return data;
+      }
+    }
+
     return data.getAuctionData;
   }
 

standards/init-commit.md

@@ -0,0 +1,7 @@
+# Initial Commit for QWRK UX Changes
+
+This is the first commit for QWRK UX changes to a fork of the `snowballtools-base` repository in Gitea. This commit sets the foundation for the upcoming user experience improvements and modifications.
+
+- Repository: `snowballtools-base`
+- Platform: Gitea
+- Purpose: QWRK UX changes