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,14 +16,15 @@ 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 } from './entity/Deployment';
+import { Deployment, DeploymentStatus } from './entity/Deployment';
 import { ProjectMember } from './entity/ProjectMember';
 import { EnvironmentVariable } from './entity/EnvironmentVariable';
 import { Domain } from './entity/Domain';
 import { getEntities, loadAndSaveData } from './utils';
 import { UserOrganization } from './entity/UserOrganization';
 import { Deployer } from './entity/Deployer';
+import { DNSRecordAttributes } from './types';
 
 const ORGANIZATION_DATA_PATH = '../test/fixtures/organizations.json';
 
@@ -41,7 +42,7 @@ export class Database {
       database: dbPath,
       entities: [path.join(__dirname, '/entity/*')],
       synchronize: true,
-      logging: false
+      logging: false,
     });
   }
 
@@ -53,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
+        name: orgEntity.name as string,
-        }
+      });
-      )
     }
   }
 
@@ -94,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);
@@ -103,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);
@@ -118,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;
@@ -157,16 +170,15 @@ export class Database {
       .leftJoinAndSelect(
         'project.deployments',
         'deployments',
-        'deployments.isCurrent = true'
+        'deployments.isCurrent = true AND deployments.isCanonical = true',
       )
       .leftJoinAndSelect('deployments.createdBy', 'user')
-      .leftJoinAndSelect('deployments.domain', 'domain')
       .leftJoinAndSelect('deployments.deployer', 'deployer')
       .leftJoinAndSelect('project.owner', 'owner')
       .leftJoinAndSelect('project.deployers', 'deployers')
       .leftJoinAndSelect('project.organization', 'organization')
       .where('project.id = :projectId', {
-        projectId
+        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,17 +216,16 @@ export class Database {
       .leftJoinAndSelect(
         'project.deployments',
         'deployments',
-        'deployments.isCurrent = true'
+        'deployments.isCurrent = true AND deployments.isCanonical = true',
       )
-      .leftJoinAndSelect('deployments.domain', 'domain')
       .leftJoin('project.projectMembers', 'projectMembers')
       .leftJoin('project.organization', 'organization')
       .where(
         '(project.ownerId = :userId OR projectMembers.userId = :userId) AND organization.slug = :organizationSlug',
         {
           userId,
-          organizationSlug
+          organizationSlug,
-        }
+        },
       )
       .getMany();
 
@@ -223,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);
@@ -235,23 +248,43 @@ export class Database {
     return this.getDeployments({
       relations: {
         project: true,
-        domain: true,
         createdBy: true,
         deployer: true,
       },
       where: {
         project: {
-          id: projectId
+          id: projectId,
-        }
+        },
       },
       order: {
-        createdAt: 'DESC'
+        createdAt: 'DESC',
+      },
+    });
   }
+
+  async getNonCanonicalDeploymentsByProjectId(
+    projectId: string,
+  ): Promise<Deployment[]> {
+    return this.getDeployments({
+      relations: {
+        project: true,
+        createdBy: true,
+        deployer: true,
+      },
+      where: {
+        project: {
+          id: projectId,
+        },
+        isCanonical: false,
+      },
+      order: {
+        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);
@@ -273,7 +306,7 @@ export class Database {
 
     const updatedData = {
       ...data,
-      id
+      id,
     };
     const deployment = await deploymentRepository.save(updatedData);
 
@@ -281,7 +314,7 @@ export class Database {
   }
 
   async getProjectMembersByProjectId(
-    projectId: string
+    projectId: string,
   ): Promise<ProjectMember[]> {
     const projectMemberRepository =
       this.dataSource.getRepository(ProjectMember);
@@ -289,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;
@@ -303,7 +336,7 @@ export class Database {
 
   async getEnvironmentVariablesByProjectId(
     projectId: string,
-    filter?: FindOptionsWhere<EnvironmentVariable>
+    filter?: FindOptionsWhere<EnvironmentVariable>,
   ): Promise<EnvironmentVariable[]> {
     const environmentVariableRepository =
       this.dataSource.getRepository(EnvironmentVariable);
@@ -311,10 +344,10 @@ export class Database {
     const environmentVariables = await environmentVariableRepository.find({
       where: {
         project: {
-          id: projectId
+          id: projectId,
+        },
+        ...filter,
       },
-        ...filter
-      }
     });
 
     return environmentVariables;
@@ -325,7 +358,7 @@ export class Database {
       this.dataSource.getRepository(ProjectMember);
 
     const deleteResult = await projectMemberRepository.delete({
-      id: projectMemberId
+      id: projectMemberId,
     });
 
     if (deleteResult.affected) {
@@ -337,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);
@@ -360,7 +393,7 @@ export class Database {
   }
 
   async addEnvironmentVariables(
-    data: DeepPartial<EnvironmentVariable>[]
+    data: DeepPartial<EnvironmentVariable>[],
   ): Promise<EnvironmentVariable[]> {
     const environmentVariableRepository =
       this.dataSource.getRepository(EnvironmentVariable);
@@ -372,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) {
@@ -407,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) {
@@ -425,7 +458,7 @@ export class Database {
 
   async getProjectsBySearchText(
     userId: string,
-    searchText: string
+    searchText: string,
   ): Promise<Project[]> {
     const projectRepository = this.dataSource.getRepository(Project);
 
@@ -437,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();
 
@@ -447,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);
@@ -464,7 +497,7 @@ export class Database {
 
   async updateDeploymentsByProjectIds(
     projectIds: string[],
-    data: DeepPartial<Deployment>
+    data: DeepPartial<Deployment>,
   ): Promise<boolean> {
     const deploymentRepository = this.dataSource.getRepository(Deployment);
 
@@ -482,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);
@@ -491,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
@@ -504,7 +541,7 @@ export class Database {
     newProject.owner = user;
 
     newProject.organization = Object.assign(new Organization(), {
-      id: organizationId
+      id: organizationId,
     });
 
     return projectRepository.save(newProject);
@@ -518,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);
@@ -533,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);
@@ -573,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);
@@ -583,25 +620,66 @@ 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(projectId: string): Promise<Domain | null> {
+    const domainRepository = this.dataSource.getRepository(Domain);
+
+    const domain = await domainRepository.findOne({
+      where: {
+        project: {
+          id: projectId,
+        },
+      },
+      order: {
+        createdAt: 'ASC',
+      },
+    });
+
+    return domain;
+  }
+
+  async getLatestDNSRecordByProjectId(
+    projectId: string,
+  ): Promise<DNSRecordAttributes | null> {
+    const deploymentRepository = this.dataSource.getRepository(Deployment);
+
+    const deployment = await deploymentRepository.findOne({
+      where: {
+        project: {
+          id: projectId,
+        },
+        status: DeploymentStatus.Ready,
+      },
+      order: {
+        createdAt: 'DESC',
+      },
+    });
+
+    if (deployment === null) {
+      throw new Error(`No deployment found for project ${projectId}`);
+    }
+
+    return deployment.dnsRecordData;
+  }
+
   async addDeployer(data: DeepPartial<Deployer>): Promise<Deployer> {
     const deployerRepository = this.dataSource.getRepository(Deployer);
     const newDomain = await deployerRepository.save(data);
@@ -617,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/Deployment.ts

@@ -14,7 +14,7 @@ import { Project } from './Project';
 import { Domain } from './Domain';
 import { User } from './User';
 import { Deployer } from './Deployer';
-import { AppDeploymentRecordAttributes, AppDeploymentRemovalRecordAttributes } from '../types';
+import { AppDeploymentRecordAttributes, AppDeploymentRemovalRecordAttributes, DNSRecordAttributes } from '../types';
 
 export enum Environment {
   Production = 'Production',
@@ -39,6 +39,7 @@ export interface ApplicationDeploymentRequest {
   config: string;
   meta: string;
   payment?: string;
+  dns?: string;
 }
 
 export interface ApplicationDeploymentRemovalRequest {
@@ -77,13 +78,6 @@ export class Deployment {
   @JoinColumn({ name: 'projectId' })
     project!: Project;
 
-  @Column({ nullable: true })
-    domainId!: string | null;
-
-  @OneToOne(() => Domain)
-  @JoinColumn({ name: 'domainId' })
-    domain!: Domain | null;
-
   @Column('varchar')
     branch!: string;
 
@@ -126,6 +120,9 @@ export class Deployment {
   @Column('simple-json', { nullable: true })
     applicationDeploymentRemovalRecordData!: AppDeploymentRemovalRecordAttributes | null;
 
+  @Column('simple-json', { nullable: true })
+    dnsRecordData!: DNSRecordAttributes | null;
+
   @ManyToOne(() => Deployer)
   @JoinColumn({ name: 'deployerLrn' })
     deployer!: Deployer;
@@ -138,6 +135,9 @@ export class Deployment {
   @Column('boolean', { default: false })
     isCurrent!: boolean;
 
+  @Column('boolean', { default: false })
+    isCanonical!: boolean;
+
   @Column({
     enum: DeploymentStatus
   })

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,20 +20,33 @@ import {
   ApplicationRecord,
   Deployment,
   ApplicationDeploymentRequest,
-  ApplicationDeploymentRemovalRequest
+  ApplicationDeploymentRemovalRequest,
 } from './entity/Deployment';
-import { AppDeploymentRecord, AppDeploymentRemovalRecord, AuctionParams, DeployerRecord } 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'
+const WEBAPP_DEPLOYER_RECORD_TYPE = 'WebappDeployer';
 const SLEEP_DURATION = 1000;
 
 // TODO: Move registry code to registry-sdk/watcher-ts
@@ -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,24 +126,12 @@ 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 fee = parseGasAndFees(this.registryConfig.fee.gas, this.registryConfig.fee.fees);
+    const result = await this.publishRecord(applicationRecord);
-
-    const result = await registryTransactionWithRetry(() =>
-      this.registry.setRecord(
-        {
-          privateKey: this.registryConfig.privateKey,
-          record: applicationRecord,
-          bondId: this.registryConfig.bondId
-        },
-        this.registryConfig.privateKey,
-        fee
-      )
-    );
 
     log(`Published application record ${result.id}`);
     log('Application record data:', applicationRecord);
@@ -129,16 +140,9 @@ export class Registry {
     const lrn = this.getLrn(repo);
     log(`Setting name: ${lrn} for record ID: ${result.id}`);
 
-    await sleep(SLEEP_DURATION);
+    const fee = parseGasAndFees(
-    await registryTransactionWithRetry(() =>
+      this.registryConfig.fee.gas,
-      this.registry.setName(
+      this.registryConfig.fee.fees,
-        {
-          cid: result.id,
-          lrn
-        },
-        this.registryConfig.privateKey,
-        fee
-      )
     );
 
     await sleep(SLEEP_DURATION);
@@ -146,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);
@@ -158,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,
     };
   }
 
@@ -177,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');
 
@@ -192,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,
@@ -205,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');
@@ -220,39 +239,29 @@ export class Registry {
       type: APP_DEPLOYMENT_AUCTION_RECORD_TYPE,
     };
 
-    const result = await registryTransactionWithRetry(() =>
+    const result = await this.publishRecord(applicationDeploymentAuction);
-      this.registry.setRecord(
-        {
-          privateKey: this.registryConfig.privateKey,
-          record: applicationDeploymentAuction,
-          bondId: this.registryConfig.bondId
-        },
-        this.registryConfig.privateKey,
-        fee
-      )
-    );
 
     log(`Application deployment auction created: ${auctionResult.auction.id}`);
     log(`Application deployment auction record published: ${result.id}`);
     log('Application deployment auction data:', applicationDeploymentAuction);
 
     return {
-      applicationDeploymentAuctionId: auctionResult.auction.id,
+      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;
@@ -265,12 +274,15 @@ export class Registry {
       throw new Error(`No record found for ${lrn}`);
     }
 
-    const hash = await this.generateConfigHash(
+    let hash;
+    if (Object.keys(data.environmentVariables).length !== 0) {
+      hash = await this.generateConfigHash(
         data.environmentVariables,
         data.requesterAddress,
         data.publicKey,
         data.apiUrl,
       );
+    }
 
     // Create record of type ApplicationDeploymentRequest and publish
     const applicationDeploymentRequest = {
@@ -281,15 +293,13 @@ export class Registry {
       dns: data.dns,
 
       // https://git.vdb.to/cerc-io/laconic-registry-cli/commit/129019105dfb93bebcea02fde0ed64d0f8e5983b
-      config: JSON.stringify({
+      config: JSON.stringify(hash ? { ref: 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 }),
@@ -298,31 +308,19 @@ export class Registry {
 
     await sleep(SLEEP_DURATION);
 
-    const fee = parseGasAndFees(this.registryConfig.fee.gas, this.registryConfig.fee.fees);
+    const result = await this.publishRecord(applicationDeploymentRequest);
-
-    const result = await registryTransactionWithRetry(() =>
-      this.registry.setRecord(
-        {
-          privateKey: this.registryConfig.privateKey,
-          record: applicationDeploymentRequest,
-          bondId: this.registryConfig.bondId
-        },
-        this.registryConfig.privateKey,
-        fee
-      )
-    );
 
     log(`Application deployment request record published: ${result.id}`);
     log('Application deployment request data:', applicationDeploymentRequest);
 
     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];
@@ -335,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;
       });
 
@@ -350,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;
@@ -371,50 +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 and Deployment specific URL
+    // Filter records with ApplicationDeploymentRequestId ID
     return records.filter((record: AppDeploymentRecord) =>
       deployments.some(
         (deployment) =>
-          deployment.applicationDeploymentRequestId === record.attributes.request &&
+          deployment.applicationDeploymentRequestId ===
-          record.attributes.url.includes(deployment.id)
+          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,
     );
   }
 
@@ -422,26 +425,36 @@ 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
+   */
+  async getRecordById(id: string): Promise<RegistryRecord | null> {
+    const [record] = await this.registry.getRecordsByIds([id]);
+    return record ?? null;
+  }
+
   async createApplicationDeploymentRemovalRequest(data: {
     deploymentId: string;
     deployerLrn: string;
@@ -460,26 +473,22 @@ export class Registry {
       ...(data.payment && { payment: data.payment }),
     };
 
-    const fee = parseGasAndFees(this.registryConfig.fee.gas, this.registryConfig.fee.fees);
+    const result = await this.publishRecord(
-
+      applicationDeploymentRemovalRequest,
-    const result = await registryTransactionWithRetry(() =>
-      this.registry.setRecord(
-        {
-          privateKey: this.registryConfig.privateKey,
-          record: applicationDeploymentRemovalRequest,
-          bondId: this.registryConfig.bondId
-        },
-        this.registryConfig.privateKey,
-        fee
-      )
     );
 
-    log(`Application deployment removal request record published: ${result.id}`);
+    log(
-    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,
     };
   }
 
@@ -491,12 +500,36 @@ 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;
   }
 
+  async publishRecord(recordData: any): Promise<any> {
+    const fee = parseGasAndFees(
+      this.registryConfig.fee.gas,
+      this.registryConfig.fee.fees,
+    );
+
+    const result = await registryTransactionWithRetry(() =>
+      this.registry.setRecord(
+        {
+          privateKey: this.registryConfig.privateKey,
+          record: recordData,
+          bondId: this.registryConfig.bondId,
+        },
+        this.registryConfig.privateKey,
+        fee,
+      ),
+    );
+
+    return result;
+  }
+
   async getRecordsByName(name: string): Promise<any> {
     return this.registry.resolveNames([name]);
   }
@@ -505,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/resolvers.ts

@@ -38,7 +38,7 @@ export const createResolvers = async (service: Service): Promise<any> => {
       },
 
       deployments: async (_: any, { projectId }: { projectId: string }) => {
-        return service.getDeploymentsByProjectId(projectId);
+        return service.getNonCanonicalDeploymentsByProjectId(projectId);
       },
 
       environmentVariables: async (
@@ -95,6 +95,13 @@ export const createResolvers = async (service: Service): Promise<any> => {
       ) => {
         return service.verifyTx(txHash, amount, senderAddress);
       },
+
+      latestDNSRecord: async (
+        _: any,
+        { projectId }: { projectId: string },
+      ) => {
+        return service.getLatestDNSRecordByProjectId(projectId);
+      },
     },
 
     // TODO: Return error in GQL response

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/schema.gql

@@ -100,7 +100,6 @@ type ProjectMember {
 
 type Deployment {
   id: String!
-  domain: Domain
   branch: String!
   commitHash: String!
   commitMessage: String!
@@ -108,6 +107,7 @@ type Deployment {
   environment: Environment!
   deployer: Deployer
   applicationDeploymentRequestId: String
+  applicationDeploymentRecordData: AppDeploymentRecordAttributes
   isCurrent: Boolean!
   baseDomain: String
   status: DeploymentStatus!
@@ -249,6 +249,27 @@ type Auction {
   bids: [Bid!]!
 }
 
+type DNSRecordAttributes {
+  name: String
+  value: String
+  request: String
+  resourceType: String
+  version: String
+}
+
+type AppDeploymentRecordAttributes {
+  application: String
+  auction: String
+  deployer: String
+  dns: String
+  meta: String
+  name: String
+  request: String
+  type: String
+  url: String
+  version: String
+}
+
 input AuctionParams {
   maxPrice: String,
   numProviders: Int,
@@ -265,6 +286,7 @@ type Query {
   projectMembers(projectId: String!): [ProjectMember!]
   searchProjects(searchText: String!): [Project!]
   getAuctionData(auctionId: String!): Auction!
+  latestDNSRecord(projectId: String!): DNSRecordAttributes
   domains(projectId: String!, filter: FilterDomainsInput): [Domain]
   deployers: [Deployer]
   address: String!

packages/backend/src/types.ts

@@ -40,6 +40,22 @@ export interface AppDeploymentRecordAttributes {
   version: string;
 }
 
+export interface DNSRecordAttributes {
+  name: string;
+  value: string;
+  request: string;
+  resourceType: string;
+  version: string;
+}
+
+export interface RegistryDNSRecordAttributes {
+  name: string;
+  value: string;
+  request: string;
+  resource_type: string;
+  version: string;
+}
+
 export interface AppDeploymentRemovalRecordAttributes {
   deployment: string;
   request: string;
@@ -47,7 +63,7 @@ export interface AppDeploymentRemovalRecordAttributes {
   version: string;
 }
 
-interface RegistryRecord {
+export interface RegistryRecord {
   id: string;
   names: string[] | null;
   owners: string[];
@@ -64,6 +80,10 @@ export interface AppDeploymentRemovalRecord extends RegistryRecord {
   attributes: AppDeploymentRemovalRecordAttributes;
 }
 
+export interface DNSRecord extends RegistryRecord {
+  attributes: RegistryDNSRecordAttributes
+}
+
 export interface AddProjectFromTemplateInput {
   templateOwner: string;
   templateRepo: string;

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} />
-    </Web3Provider>
   );
 }
 

packages/frontend/src/components/projects/ProjectCard/ProjectCard.tsx

@@ -4,7 +4,11 @@ import {
   MenuItem,
   MenuList,
 } from '@snowballtools/material-tailwind-react-fork';
-import { ComponentPropsWithoutRef, MouseEvent, useCallback } from 'react';
+import {
+  ComponentPropsWithoutRef,
+  MouseEvent,
+  useCallback,
+} from 'react';
 import { useNavigate } from 'react-router-dom';
 import { Project } from 'gql-client';
 import { Avatar } from 'components/shared/Avatar';
@@ -83,7 +87,7 @@ export const ProjectCard = ({
             <p className={theme.title()}>{project.name}</p>
           </Tooltip>
           <p className={theme.description()}>
-            {project.deployments[0]?.domain?.name ?? 'No domain'}
+            {project.deployments[0]?.applicationDeploymentRecordData?.url ?? 'No domain'}
           </p>
         </div>
         {/* Icons */}

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;
 
+      if (event.data.type === WALLET_ACCOUNTS_DATA) {
         setIsDataReceived(true);
-      if (event.data.type === 'WALLET_ACCOUNTS_DATA') {
+
-        setAccounts(event.data.data);
+        if (event.data.data.length === 0) {
-      } else if (event.data.type === 'ERROR') {
+          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>
@@ -566,7 +592,7 @@ const Configure = () => {
                 <Button
                   {...buttonSize}
                   type="submit"
-                  disabled={isLoading || !selectedDeployer || !selectedAccount}
+                  disabled={isLoading || !selectedDeployer}
                   rightIcon={
                     isLoading ? (
                       <LoadingIcon className="animate-spin" />
@@ -579,20 +605,18 @@ const Configure = () => {
                 </Button>
               </div>
             ) : (
-              <>
+              <div className="flex gap-4">
-                <AccountsDropdown
-                  accounts={accounts}
-                  onAccountChange={onAccountChange}
-                  isDataReceived={isAccountsDataReceived}
-                />
-                {accounts.length > 0 && (
-                  <div>
                 <Button
                   {...buttonSize}
                   type="submit"
                   shape="default"
                   disabled={
-                        isLoading || isPaymentLoading || !selectedAccount
+                    isLoading ||
+                    isPaymentLoading ||
+                    !selectedAccount ||
+                    !isBalanceSufficient ||
+                    amountToBePaid === '' ||
+                    selectedNumProviders === ''
                   }
                   rightIcon={
                     isLoading || isPaymentLoading ? (
@@ -610,18 +634,54 @@ const Configure = () => {
                       ? '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.'
+                        ) : (
+                          'Insufficient funds.'
                         )}
-              </>
+                      </p>
+                    </div>
+                  ) : null
+                ) : null}
+              </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/deployments/AssignDomainDialog.tsx

@@ -1,42 +0,0 @@
-import { CopyBlock, atomOneLight } from 'react-code-blocks';
-import { Link } from 'react-router-dom';
-
-import { Modal } from 'components/shared/Modal';
-import { Button } from 'components/shared/Button';
-
-interface AssignDomainProps {
-  open: boolean;
-  handleOpen: () => void;
-}
-
-const AssignDomainDialog = ({ open, handleOpen }: AssignDomainProps) => {
-  return (
-    <Modal open={open} onOpenChange={handleOpen}>
-      <Modal.Content>
-        <Modal.Header>Assign Domain</Modal.Header>
-        <Modal.Body>
-          In order to assign a domain to your production deployments, configure
-          it in the{' '}
-          {/* TODO: Fix selection of project settings tab on navigation to domains */}
-          <Link to="../settings/domains" className="text-light-blue-800 inline">
-            project settings{' '}
-          </Link>
-          (recommended). If you want to assign to this specific deployment,
-          however, you can do so using our command-line interface:
-          {/* https://github.com/rajinwonderland/react-code-blocks/issues/138 */}
-          <CopyBlock
-            text="snowball alias <deployment> <domain>"
-            language=""
-            showLineNumbers={false}
-            theme={atomOneLight}
-          />
-        </Modal.Body>
-        <Modal.Footer className="flex justify-start">
-          <Button onClick={handleOpen}>Okay</Button>
-        </Modal.Footer>
-      </Modal.Content>
-    </Modal>
-  );
-};
-
-export default AssignDomainDialog;

packages/frontend/src/components/projects/project/deployments/DeploymentMenu.tsx

@@ -10,7 +10,6 @@ import {
 import { Deployment, Domain, Environment, Project } from 'gql-client';
 import { Button } from 'components/shared/Button';
 import {
-  GlobeIcon,
   HorizontalDotIcon,
   LinkIcon,
   RefreshIcon,
@@ -18,7 +17,6 @@ import {
   UndoIcon,
   CrossCircleIcon,
 } from 'components/shared/CustomIcon';
-import AssignDomainDialog from './AssignDomainDialog';
 import { useGQLClient } from 'context/GQLClientContext';
 import { cn } from 'utils/classnames';
 import { ChangeStateToProductionDialog } from 'components/projects/Dialog/ChangeStateToProductionDialog';
@@ -49,8 +47,8 @@ export const DeploymentMenu = ({
   const [redeployToProduction, setRedeployToProduction] = useState(false);
   const [deleteDeploymentDialog, setDeleteDeploymentDialog] = useState(false);
   const [isConfirmDeleteLoading, setIsConfirmDeleteLoading] = useState(false);
+  const [isConfirmUpdateLoading, setIsConfirmUpdateLoading] = useState(false);
   const [rollbackDeployment, setRollbackDeployment] = useState(false);
-  const [assignDomainDialog, setAssignDomainDialog] = useState(false);
   const [isConfirmButtonLoading, setConfirmButtonLoadingLoading] =
     useState(false);
 
@@ -58,6 +56,8 @@ export const DeploymentMenu = ({
     const isUpdated = await client.updateDeploymentToProd(deployment.id);
     if (isUpdated.updateDeploymentToProd) {
       await onUpdate();
+      setIsConfirmUpdateLoading(false);
+
       toast({
         id: 'deployment_changed_to_production',
         title: 'Deployment changed to production',
@@ -102,6 +102,8 @@ export const DeploymentMenu = ({
     );
     if (isRollbacked.rollbackDeployment) {
       await onUpdate();
+      setIsConfirmUpdateLoading(false);
+
       toast({
         id: 'deployment_rolled_back',
         title: 'Deployment rolled back',
@@ -173,12 +175,6 @@ export const DeploymentMenu = ({
                 <LinkIcon /> Visit
               </a>
             </MenuItem>
-            <MenuItem
-              className="hover:bg-base-bg-emphasized flex items-center gap-3"
-              onClick={() => setAssignDomainDialog(!assignDomainDialog)}
-            >
-              <GlobeIcon /> Assign domain
-            </MenuItem>
             <MenuItem
               className="hover:bg-base-bg-emphasized flex items-center gap-3"
               onClick={() => setChangeToProduction(!changeToProduction)}
@@ -226,9 +222,11 @@ export const DeploymentMenu = ({
         handleCancel={() => setChangeToProduction((preVal) => !preVal)}
         open={changeToProduction}
         handleConfirm={async () => {
+          setIsConfirmUpdateLoading(true);
           await updateDeployment();
           setChangeToProduction((preVal) => !preVal);
         }}
+        isConfirmButtonLoading={isConfirmUpdateLoading}
         deployment={deployment}
         domains={prodBranchDomains}
       />
@@ -243,7 +241,7 @@ export const DeploymentMenu = ({
           setRedeployToProduction((preVal) => !preVal);
         }}
         deployment={deployment}
-        domains={deployment.domain ? [deployment.domain] : []}
+        domains={prodBranchDomains}
         isConfirmButtonLoading={isConfirmButtonLoading}
       />
       {Boolean(currentDeployment) && (
@@ -253,18 +251,16 @@ export const DeploymentMenu = ({
           open={rollbackDeployment}
           confirmButtonTitle="Rollback"
           handleConfirm={async () => {
+            setIsConfirmUpdateLoading(true);
             await rollbackDeploymentHandler();
             setRollbackDeployment((preVal) => !preVal);
           }}
           deployment={currentDeployment}
           newDeployment={deployment}
-          domains={currentDeployment.domain ? [currentDeployment.domain] : []}
+          domains={prodBranchDomains}
+          isConfirmButtonLoading={isConfirmUpdateLoading}
         />
       )}
-      <AssignDomainDialog
-        open={assignDomainDialog}
-        handleOpen={() => setAssignDomainDialog(!assignDomainDialog)}
-      />
       <DeleteDeploymentDialog
         open={deleteDeploymentDialog}
         handleConfirm={async () => {

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/projects/project/settings/DomainCard.tsx

@@ -1,5 +1,5 @@
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
-import { Domain, DomainStatus, Project } from 'gql-client';
+import { DNSRecordAttributes, Domain, DomainStatus, Project } from 'gql-client';
 
 import {
   Typography,
@@ -14,22 +14,27 @@ import EditDomainDialog from './EditDomainDialog';
 import { useGQLClient } from 'context/GQLClientContext';
 import { DeleteDomainDialog } from 'components/projects/Dialog/DeleteDomainDialog';
 import { useToast } from 'components/shared/Toast';
-import { Tag } from 'components/shared/Tag';
+import { GearIcon } from 'components/shared/CustomIcon';
-import {
-  CheckIcon,
-  CrossIcon,
-  GearIcon,
-  LoadingIcon,
-} from 'components/shared/CustomIcon';
 import { Heading } from 'components/shared/Heading';
 import { Button } from 'components/shared/Button';
+import { useParams } from 'react-router-dom';
 
-enum RefreshStatus {
+// NOTE: Commented code for verify domain functionality
-  IDLE,
+// import { Tag } from 'components/shared/Tag';
-  CHECKING,
+// import {
-  CHECK_SUCCESS,
+//   CheckIcon,
-  CHECK_FAIL,
+//   CrossIcon,
-}
+//   LoadingIcon,
+// } from 'components/shared/CustomIcon';
+
+// enum RefreshStatus {
+//   IDLE,
+//   CHECKING,
+//   CHECK_SUCCESS,
+//   CHECK_FAIL,
+// }
+
+// const CHECK_FAIL_TIMEOUT = 5000; // In milliseconds
 
 interface DomainCardProps {
   domains: Domain[];
@@ -39,14 +44,6 @@ interface DomainCardProps {
   onUpdate: () => Promise<void>;
 }
 
-const CHECK_FAIL_TIMEOUT = 5000; // In milliseconds
-
-// TODO: Get domain record
-const DOMAIN_RECORD = {
-  type: 'A',
-  name: '@',
-  value: '56.49.19.21',
-};
 
 const DomainCard = ({
   domains,
@@ -56,9 +53,11 @@ const DomainCard = ({
   onUpdate,
 }: DomainCardProps) => {
   const { toast, dismiss } = useToast();
-  const [refreshStatus, SetRefreshStatus] = useState(RefreshStatus.IDLE);
+  const { id } = useParams();
   const [deleteDialogOpen, setDeleteDialogOpen] = useState(false);
   const [editDialogOpen, setEditDialogOpen] = useState(false);
+  const [dnsRecord, setDnsRecord] = useState<DNSRecordAttributes | null>(null);
+  // const [refreshStatus, SetRefreshStatus] = useState(RefreshStatus.IDLE);
 
   const client = useGQLClient();
 
@@ -83,13 +82,33 @@ const DomainCard = ({
     }
   };
 
+  useEffect(() => {
+    const fetchDNSData = async () => {
+      if (id === undefined) {
+        toast({
+          id: 'domain_cannot_find_project',
+          title: 'Cannot find project',
+          variant: 'error',
+          onDismiss: dismiss,
+        });
+        return;
+      }
+
+      const dnsRecordResponse = await client.getLatestDNSRecordByProjectId(id);
+
+      setDnsRecord(dnsRecordResponse.latestDNSRecord);
+    };
+
+    fetchDNSData();
+  }, [id, client]);
+
   return (
     <>
       <div className="flex justify-between py-3">
         <div className="flex justify-start gap-1">
           <Heading as="h6" className="flex-col">
             {domain.name}{' '}
-            <Tag
+            {/* <Tag
               type={
                 domain.status === DomainStatus.Live ? 'positive' : 'negative'
               }
@@ -102,12 +121,12 @@ const DomainCard = ({
               }
             >
               {domain.status}
-            </Tag>
+            </Tag> */}
           </Heading>
         </div>
 
         <div className="flex justify-start gap-1">
-          <i
+          {/* <i
             id="refresh"
             className="cursor-pointer"
             onClick={() => {
@@ -122,7 +141,7 @@ const DomainCard = ({
             ) : (
               'L'
             )}
-          </i>
+          </i> */}
           <Menu placement="bottom-end">
             <MenuHandler>
               <Button iconOnly>
@@ -163,11 +182,11 @@ const DomainCard = ({
       <Typography variant="small">Production</Typography>
       {domain.status === DomainStatus.Pending && (
         <Card className="bg-slate-100 p-4 text-sm">
-          {refreshStatus === RefreshStatus.IDLE ? (
+          {/* {refreshStatus === RefreshStatus.IDLE ? ( */}
           <Heading>
-              ^ Add these records to your domain and refresh to check
+            ^ Add these records to your domain {/* and refresh to check */}
           </Heading>
-          ) : refreshStatus === RefreshStatus.CHECKING ? (
+          {/* ) : refreshStatus === RefreshStatus.CHECKING ? (
             <Heading className="text-blue-500">
               ^ Checking records for {domain.name}
             </Heading>
@@ -178,7 +197,7 @@ const DomainCard = ({
                 hours. Please ensure you added the correct records and refresh.
               </div>
             </div>
-          )}
+          )} */}
 
           <table>
             <thead>
@@ -189,11 +208,15 @@ const DomainCard = ({
               </tr>
             </thead>
             <tbody>
+              {dnsRecord ? (
                 <tr>
-                <td>{DOMAIN_RECORD.type}</td>
+                  <td>{dnsRecord.resourceType}</td>
-                <td>{DOMAIN_RECORD.name}</td>
+                  <td>@</td>
-                <td>{DOMAIN_RECORD.value}</td>
+                  <td>{dnsRecord.value ?? 'Not Configured'}</td>
                 </tr>
+              ) : (
+                <p className={'text-red-500'}>DNS record data not available</p>
+              )}
             </tbody>
           </table>
         </Card>

packages/frontend/src/components/projects/project/settings/EditDomainDialog.tsx

@@ -1,11 +1,15 @@
-import { useCallback, useEffect, useMemo } from 'react';
+import {
-import { Controller, useForm, SubmitHandler } from 'react-hook-form';
+  useCallback,
+  useEffect,
+} from 'react';
+import {
+  useForm,
+  SubmitHandler,
+} from 'react-hook-form';
 import { Domain } from 'gql-client';
 
 import {
   Typography,
-  Select,
-  Option,
 } from '@snowballtools/material-tailwind-react-fork';
 
 import { useGQLClient } from 'context/GQLClientContext';
@@ -14,7 +18,15 @@ import { Button } from 'components/shared/Button';
 import { Input } from 'components/shared/Input';
 import { useToast } from 'components/shared/Toast';
 
-const DEFAULT_REDIRECT_OPTIONS = ['none'];
+// NOTE: Commented code for redirect domain functionality
+// import {
+//   Select,
+//   Option,
+// } from '@snowballtools/material-tailwind-react-fork';
+// import { Controller } from 'react-hook-form';
+// import { useMemo } from 'react';
+
+// const DEFAULT_REDIRECT_OPTIONS = ['none'];
 
 interface EditDomainDialogProp {
   domains: Domain[];
@@ -28,7 +40,7 @@ interface EditDomainDialogProp {
 type EditDomainValues = {
   name: string;
   branch: string;
-  redirectedTo: string;
+  // redirectedTo: string;
 };
 
 const EditDomainDialog = ({
@@ -42,58 +54,58 @@ const EditDomainDialog = ({
   const client = useGQLClient();
   const { toast, dismiss } = useToast();
 
-  const getRedirectUrl = (domain: Domain) => {
+  // const getRedirectUrl = (domain: Domain) => {
-    const redirectDomain = domain.redirectTo;
+  //   const redirectDomain = domain.redirectTo;
 
-    if (redirectDomain !== null) {
+  //   if (redirectDomain !== null) {
-      return redirectDomain?.name;
+  //     return redirectDomain?.name;
-    } else {
+  //   } else {
-      return 'none';
+  //     return 'none';
-    }
+  //   }
-  };
+  // };
 
-  const redirectOptions = useMemo(() => {
+  // const redirectOptions = useMemo(() => {
-    const domainNames = domains
+  //   const domainNames = domains
-      .filter((domainData) => domainData.id !== domain.id)
+  //     .filter((domainData) => domainData.id !== domain.id)
-      .map((domain) => domain.name);
+  //     .map((domain) => domain.name);
-    return ['none', ...domainNames];
+  //   return ['none', ...domainNames];
-  }, [domain, domains]);
+  // }, [domain, domains]);
 
-  const domainRedirectedFrom = useMemo(() => {
+  // const domainRedirectedFrom = useMemo(() => {
-    return domains.find(
+  //   return domains.find(
-      (domainData) => domainData.redirectTo?.id === domain.id,
+  //     (domainData) => domainData.redirectTo?.id === domain.id,
-    );
+  //   );
-  }, [domains, domain]);
+  // }, [domains, domain]);
 
-  const isDisableDropdown = useMemo(() => {
+  // const isDisableDropdown = useMemo(() => {
-    return domainRedirectedFrom !== undefined;
+  //   return domainRedirectedFrom !== undefined;
-  }, [domain, domains]);
+  // }, [domain, domains]);
 
   const {
     handleSubmit,
     register,
-    control,
+    // control,
-    watch,
+    // watch,
     reset,
     formState: { isValid, isDirty },
   } = useForm({
     defaultValues: {
       name: domain.name,
       branch: domain.branch,
-      redirectedTo: getRedirectUrl(domain),
+      // redirectedTo: getRedirectUrl(domain),
     },
   });
 
   const updateDomainHandler: SubmitHandler<EditDomainValues> = useCallback(
     async (data) => {
-      const domainRedirectTo = domains.find(
+      // const domainRedirectTo = domains.find(
-        (domainData) => data.redirectedTo === domainData.name,
+      //   (domainData) => data.redirectedTo === domainData.name,
-      );
+      // );
 
       const updates = {
         name: data.name ? data.name : domain.name,
         branch: data.branch ? data.branch : domain.branch,
-        redirectToId: domainRedirectTo ? domainRedirectTo.id : null,
+        // redirectToId: domainRedirectTo ? domainRedirectTo.id : null,
       };
 
       const { updateDomain } = await client.updateDomain(domain.id, updates);
@@ -125,7 +137,7 @@ const EditDomainDialog = ({
     reset({
       name: domain.name,
       branch: domain.branch,
-      redirectedTo: getRedirectUrl(domain),
+      // redirectedTo: getRedirectUrl(domain),
     });
   }, [domain]);
 
@@ -137,7 +149,7 @@ const EditDomainDialog = ({
           <Modal.Body className="flex flex-col gap-2">
             <Typography variant="small">Domain name</Typography>
             <Input {...register('name')} />
-            <Typography variant="small">Redirect to</Typography>
+            {/* <Typography variant="small">Redirect to</Typography>
             <Controller
               name="redirectedTo"
               control={control}
@@ -161,7 +173,7 @@ const EditDomainDialog = ({
                   further.
                 </Typography>
               </div>
-            )}
+            )} */}
             <Typography variant="small">Git branch</Typography>
             <Input
               {...register('branch', {
@@ -169,8 +181,8 @@ const EditDomainDialog = ({
                   Boolean(branches.length) ? branches.includes(value) : true,
               })}
               disabled={
-                !Boolean(branches.length) ||
+                !Boolean(branches.length)
-                watch('redirectedTo') !== DEFAULT_REDIRECT_OPTIONS[0]
+                // || watch('redirectedTo') !== DEFAULT_REDIRECT_OPTIONS[0]
               }
             />
             {!isValid && (

packages/frontend/src/components/projects/project/settings/SetupDomain.tsx

@@ -1,12 +1,14 @@
-import { useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { useForm } from 'react-hook-form';
 
 import { Heading } from 'components/shared/Heading';
-import { InlineNotification } from 'components/shared/InlineNotification';
 import { Input } from 'components/shared/Input';
 import { Button } from 'components/shared/Button';
-import { Radio } from 'components/shared/Radio';
+
+// NOTE: Commented code for redirect domain functionality
+// import { useEffect, useState } from 'react';
+// import { InlineNotification } from 'components/shared/InlineNotification';
+// import { Radio } from 'components/shared/Radio';
 
 interface SetupDomainFormValues {
   domainName: string;
@@ -18,47 +20,45 @@ const SetupDomain = () => {
     register,
     handleSubmit,
     formState: { isValid },
-    watch,
+    // watch,
-    setValue,
+    // setValue,
   } = useForm<SetupDomainFormValues>({
     defaultValues: {
       domainName: '',
-      isWWW: 'false',
+      // isWWW: 'false',
     },
     mode: 'onChange',
   });
 
-  const [domainStr, setDomainStr] = useState<string>('');
   const navigate = useNavigate();
-  const isWWWRadioOptions = [
+  // const [domainStr, setDomainStr] = useState<string>('');
-    { label: domainStr, value: 'false' },
+  // const isWWWRadioOptions = [
-    { label: `www.${domainStr}`, value: 'true' },
+  //   { label: domainStr, value: 'false' },
-  ];
+  //   { label: `www.${domainStr}`, value: 'true' },
+  // ];
 
-  useEffect(() => {
+  // useEffect(() => {
-    const subscription = watch((value, { name }) => {
+  //   const subscription = watch((value, { name }) => {
-      if (name === 'domainName' && value.domainName) {
+  //     if (name === 'domainName' && value.domainName) {
-        const domainArr = value.domainName.split('www.');
+  //       const domainArr = value.domainName.split('www.');
-        const cleanedDomain =
+  //       const cleanedDomain =
-          domainArr.length > 1 ? domainArr[1] : domainArr[0];
+  //         domainArr.length > 1 ? domainArr[1] : domainArr[0];
-        setDomainStr(cleanedDomain);
+  //       setDomainStr(cleanedDomain);
 
-        setValue(
+  //       setValue(
-          'isWWW',
+  //         'isWWW',
-          value.domainName.startsWith('www.') ? 'true' : 'false',
+  //         value.domainName.startsWith('www.') ? 'true' : 'false',
-        );
+  //       );
-      }
+  //     }
-    });
+  //   });
 
-    return () => subscription.unsubscribe();
+  //   return () => subscription.unsubscribe();
-  }, [watch, setValue]);
+  // }, [watch, setValue]);
 
   return (
     <form
-      onSubmit={handleSubmit(() => {
+      onSubmit={handleSubmit((e) => {
-        watch('isWWW') === 'true'
+        navigate(`config?name=${e.domainName}`)
-          ? navigate(`config?name=www.${domainStr}`)
-          : navigate(`config?name=${domainStr}`);
       })}
       className="flex flex-col gap-6 w-full"
     >
@@ -67,7 +67,7 @@ const SetupDomain = () => {
           Setup domain name
         </Heading>
         <p className="text-slate-500 text-sm font-normal leading-tight">
-          Add your domain and setup redirects
+          Add your domain {/* and setup redirects */}
         </p>
       </div>
 
@@ -80,7 +80,7 @@ const SetupDomain = () => {
         label="Domain name"
       />
 
-      {isValid && (
+      {/* {isValid && (
         <div className="self-stretch flex flex-col gap-4">
           <Heading className="text-sky-950 text-lg font-medium leading-normal">
             Primary domain
@@ -99,7 +99,7 @@ const SetupDomain = () => {
             }. Redirect preferences can be changed later`}
           />
         </div>
-      )}
+      )} */}
 
       <div className="self-stretch">
         <Button disabled={!isValid} type="submit" shape="default">

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}>
           <App />
           <Toaster />
         </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/components/modals.tsx

@@ -10,6 +10,7 @@ import { DeleteVariableDialog } from 'components/projects/Dialog/DeleteVariableD
 import { DeleteDomainDialog } from 'components/projects/Dialog/DeleteDomainDialog';
 import { CancelDeploymentDialog } from 'components/projects/Dialog/CancelDeploymentDialog';
 import {
+  AppDeploymentRecordAttributes,
   Deployment,
   DeploymentStatus,
   Domain,
@@ -20,15 +21,6 @@ import { ChangeStateToProductionDialog } from 'components/projects/Dialog/Change
 
 const deployment: Deployment = {
   id: '1',
-  domain: {
-    id: 'domain1',
-    branch: 'main',
-    name: 'example.com',
-    status: DomainStatus.Live,
-    redirectTo: null,
-    createdAt: '1677609600', // 2023-02-25T12:00:00Z
-    updatedAt: '1677613200', // 2023-02-25T13:00:00Z
-  },
   branch: 'main',
   commitHash: 'a1b2c3d',
   commitMessage:
@@ -57,6 +49,7 @@ const deployment: Deployment = {
   updatedAt: '1677680400', // 2023-03-01T13:00:00Z
   applicationDeploymentRequestId:
     'bafyreiaycvq6imoppnpwdve4smj6t6ql5svt5zl3x6rimu4qwyzgjorize',
+  applicationDeploymentRecordData: {} as AppDeploymentRecordAttributes,
 };
 
 const domains: Domain[] = [
@@ -252,7 +245,7 @@ const ModalsPage: React.FC = () => {
                   setRedeployToProduction((preVal) => !preVal)
                 }
                 deployment={deployment}
-                domains={deployment.domain ? [deployment.domain] : []}
+                domains={domains}
               />
               {/* Rollback to this deployment */}
               <Button onClick={() => setRollbackDeployment(true)}>
@@ -268,7 +261,7 @@ const ModalsPage: React.FC = () => {
                 }
                 deployment={deployment}
                 newDeployment={deployment}
-                domains={deployment.domain ? [deployment.domain] : []}
+                domains={domains}
               />
             </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

@@ -1,39 +1,54 @@
 import { useEffect, useState } from 'react';
-import { Link, useNavigate, useOutletContext } from 'react-router-dom';
+import {
+  Link,
+  useOutletContext,
+} from 'react-router-dom';
 import { RequestError } from 'octokit';
 
-import { useOctokit } from 'context/OctokitContext';
+import {
-import { GitCommitWithBranch, OutletContextType } from '../../../../types';
+  Heading,
-import { useGQLClient } from 'context/GQLClientContext';
+  Avatar,
-import { Button, Heading, Avatar, Tag } from 'components/shared';
+} from 'components/shared';
-import { getInitials } from 'utils/geInitials';
 import {
   BranchStrokeIcon,
-  CheckRoundFilledIcon,
-  ClockIcon,
   CursorBoxIcon,
   GithubStrokeIcon,
-  GlobeIcon,
   LinkIcon,
   CalendarDaysIcon,
 } from 'components/shared/CustomIcon';
+import { useOctokit } from 'context/OctokitContext';
+import { GitCommitWithBranch, OutletContextType } from '../../../../types';
+import { getInitials } from 'utils/geInitials';
 import { Activity } from 'components/projects/project/overview/Activity';
 import { OverviewInfo } from 'components/projects/project/overview/OverviewInfo';
 import { relativeTimeMs } from 'utils/time';
-import { Domain, DomainStatus } from 'gql-client';
 import { AuctionCard } from 'components/projects/project/overview/Activity/AuctionCard';
 
+// NOTE: Commented code for verify domain functionality
+// import { useGQLClient } from 'context/GQLClientContext';
+// import { Domain, DomainStatus } from 'gql-client';
+// import {
+//   CheckRoundFilledIcon,
+//   ClockIcon,
+//   GlobeIcon,
+// } from 'components/shared/CustomIcon';
+// import {
+//   Button,
+//   Tag,
+// } from 'components/shared';
+// import { useNavigate } from 'react-router-dom';
+
 const COMMITS_PER_PAGE = 4;
 const PROJECT_UPDATE_WAIT_MS = 5000;
 
 const OverviewTabPanel = () => {
   const { octokit } = useOctokit();
-  const navigate = useNavigate();
+  // const navigate = useNavigate();
   const [activities, setActivities] = useState<GitCommitWithBranch[]>([]);
   const [fetchingActivities, setFetchingActivities] = useState(true);
-  const [liveDomain, setLiveDomain] = useState<Domain>();
+  // const [liveDomain, setLiveDomain] = useState<Domain>();
 
-  const client = useGQLClient();
+  // const client = useGQLClient();
   const { project, onUpdate } = useOutletContext<OutletContextType>();
 
   useEffect(() => {
@@ -107,22 +122,22 @@ const OverviewTabPanel = () => {
     return () => clearInterval(timerId);
   }, [onUpdate]);
 
-  useEffect(() => {
+  // useEffect(() => {
-    const fetchLiveProdDomain = async () => {
+  //   const fetchLiveProdDomain = async () => {
-      const { domains } = await client.getDomains(project.id, {
+  //     const { domains } = await client.getDomains(project.id, {
-        branch: project.prodBranch,
+  //       branch: project.prodBranch,
-        status: DomainStatus.Live,
+  //       status: DomainStatus.Live,
-      });
+  //     });
 
-      if (domains.length === 0) {
+  //     if (domains.length === 0) {
-        return;
+  //       return;
-      }
+  //     }
 
-      setLiveDomain(domains[0]);
+  //     setLiveDomain(domains[0]);
-    };
+  //   };
 
-    fetchLiveProdDomain();
+  //   fetchLiveProdDomain();
-  }, [project]);
+  // }, [project]);
 
   return (
     <div className="grid grid-cols-5 gap-6 md:gap-[72px]">
@@ -141,19 +156,16 @@ const OverviewTabPanel = () => {
             {project.deployments &&
               project.deployments.length > 0 &&
               project.deployments.map((deployment, index) => (
-                <p>
+                <p
-                  <a
                   key={index}
-                    href={`https://${project.name.toLowerCase()}.${deployment.deployer.baseDomain}`}
                   className="text-sm text-elements-low-em dark:text-foreground tracking-tight truncate"
                 >
                   {deployment.deployer.baseDomain}
-                  </a>
                 </p>
               ))}
           </div>
         </div>
-        <OverviewInfo label="Domain" icon={<GlobeIcon />}>
+        {/* <OverviewInfo label="Domain" icon={<GlobeIcon />}>
           {liveDomain ? (
             <Tag type="positive" size="xs" leftIcon={<CheckRoundFilledIcon />}>
               Connected
@@ -174,7 +186,7 @@ const OverviewTabPanel = () => {
               </Button>
             </div>
           )}
-        </OverviewInfo>
+        </OverviewInfo> */}
         {project.deployments.length !== 0 ? (
           <>
             {/* SOURCE */}
@@ -192,12 +204,10 @@ 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
+                    <Link to={deployment.applicationDeploymentRecordData.url}>
-                      to={`https://${project.name.toLowerCase()}.${deployment.deployer.baseDomain}`}
-                    >
                       <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">
-                        {`https://${project.name.toLowerCase()}.${deployment.deployer.baseDomain}`}
+                        {deployment.applicationDeploymentRecordData.url}
                         <LinkIcon className="group-hover:rotate-45 transition-transform" />
                       </span>
                     </Link>

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

@@ -60,7 +60,8 @@ const Domains = () => {
   return (
     <ProjectSettingContainer
       headingText="Domains"
-      button={
+      {...(!project.auctionId && {
+        button: (
           <Button
             as="a"
             href="add"
@@ -70,9 +71,15 @@ const Domains = () => {
           >
             Add domain
           </Button>
-      }
+        ),
+      })}
     >
-      {domains.map((domain) => {
+      {project.auctionId ? (
+        <p className="text-gray-500">
+          Custom domains not supported for auction driven deployments.
+        </p>
+      ) : (
+        domains.map((domain) => {
           return (
             <DomainCard
               domains={domains}
@@ -84,7 +91,8 @@ const Domains = () => {
               onUpdate={fetchDomains}
             />
           );
-      })}
+        })
+      )}
     </ProjectSettingContainer>
   );
 };

packages/frontend/src/pages/org-slug/projects/id/settings/domains/add/Config.tsx

@@ -7,6 +7,8 @@ import { InlineNotification } from 'components/shared/InlineNotification';
 import { ArrowRightCircleIcon } from 'components/shared/CustomIcon';
 import { ProjectSettingContainer } from 'components/projects/project/settings/ProjectSettingContainer';
 import { useToast } from 'components/shared/Toast';
+import { useEffect, useState } from 'react';
+import { DNSRecordAttributes } from 'gql-client';
 
 const Config = () => {
   const { id, orgSlug } = useParams();
@@ -16,6 +18,8 @@ const Config = () => {
   const primaryDomainName = searchParams.get('name');
   const { toast, dismiss } = useToast();
 
+  const [dnsRecord, setDnsRecord] = useState<DNSRecordAttributes | null>(null);
+
   const handleSubmitDomain = async () => {
     if (primaryDomainName === null) {
       toast({
@@ -59,9 +63,31 @@ const Config = () => {
     }
   };
 
+  useEffect(() => {
+    const fetchDNSData = async () => {
+      if (id === undefined) {
+        toast({
+          id: 'domain_cannot_find_project',
+          title: 'Cannot find project',
+          variant: 'error',
+          onDismiss: dismiss,
+        });
+        return;
+      }
+
+      const dnsRecordResponse = await client.getLatestDNSRecordByProjectId(id);
+
+      setDnsRecord(dnsRecordResponse.latestDNSRecord);
+    };
+
+    fetchDNSData();
+  }, [id, client]);
+
   // TODO: Figure out DNS Provider if possible and update appropriatly
   return (
     <ProjectSettingContainer headingText="Setup domain name">
+      {dnsRecord ? (
+        <>
           <p className="text-blue-gray-500">
             Add the following records to your domain.
           </p>
@@ -77,26 +103,29 @@ const Config = () => {
 
             <Table.Body>
               <Table.Row>
-            <Table.RowHeaderCell>A</Table.RowHeaderCell>
+                <Table.RowHeaderCell>
+                  {dnsRecord.resourceType}
+                </Table.RowHeaderCell>
                 <Table.Cell>@</Table.Cell>
-            <Table.Cell>IP.OF.THE.SP</Table.Cell>
+                <Table.Cell>
-          </Table.Row>
+                  <p className={!dnsRecord.value ? 'text-red-500' : ''}>
-
+                    {dnsRecord.value ?? 'Not available'}
-          <Table.Row>
+                  </p>
-            <Table.RowHeaderCell>CNAME</Table.RowHeaderCell>
+                </Table.Cell>
-            <Table.Cell>subdomain</Table.Cell>
-            <Table.Cell>domain.of.the.sp</Table.Cell>
               </Table.Row>
             </Table.Body>
           </Table>
 
+          {dnsRecord?.value && (
             <InlineNotification
               variant="info"
               title={`It can take up to 48 hours for these updates to reflect
           globally.`}
             />
+          )}
           <Button
             className="w-fit"
+            disabled={!dnsRecord?.value}
             onClick={handleSubmitDomain}
             variant="primary"
             shape="default"
@@ -104,6 +133,10 @@ const Config = () => {
           >
             FINISH
           </Button>
+        </>
+      ) : (
+        <p className={'text-red-500'}>DNS record data not available</p>
+      )}
     </ProjectSettingContainer>
   );
 };

packages/frontend/src/stories/MockStoriesData.ts

@@ -12,6 +12,7 @@ import {
   Domain,
   Environment,
   Permission,
+  AppDeploymentRecordAttributes,
 } from 'gql-client';
 
 export const user: User = {
@@ -99,7 +100,6 @@ export const deployment0: Deployment = {
   environment: Environment.Development,
   isCurrent: true,
   commitHash: 'Commit Hash',
-  domain: domain0,
   commitMessage: 'Commit Message',
   createdBy: user,
   deployer: {
@@ -111,6 +111,7 @@ export const deployment0: Deployment = {
   },
   applicationDeploymentRequestId:
     'bafyreiaycvq6imoppnpwdve4smj6t6ql5svt5zl3x6rimu4qwyzgjorize',
+  applicationDeploymentRecordData: {} as AppDeploymentRecordAttributes,
 };
 
 export const project: Project = {

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;
   }
 
@@ -453,4 +464,15 @@ export class GQLClient {
 
     return data.verifyTx;
   }
+
+  async getLatestDNSRecordByProjectId(projectId: string): Promise<types.GetLatestDNSDataResponse> {
+    const { data } = await this.client.query({
+      query: queries.getLatestDNSRecordByProjectId,
+      variables: {
+        projectId,
+      },
+    });
+
+    return data;
+  }
 }

packages/gql-client/src/queries.ts

@@ -57,17 +57,12 @@ query ($projectId: String!) {
       commitHash
       createdAt
       environment
+      applicationDeploymentRecordData {
+        url
+      }
       deployer {
         baseDomain
       }
-      domain {
-        status
-        branch
-        createdAt
-        updatedAt
-        id
-        name
-      }
       createdBy {
         id
         name
@@ -112,13 +107,8 @@ query ($organizationSlug: String!) {
       commitMessage
       createdAt
       environment
-      domain {
+      applicationDeploymentRecordData {
-        status
+        url
-        branch
-        createdAt
-        updatedAt
-        id
-        name
       }
     }
   }
@@ -141,14 +131,6 @@ export const getDeployments = gql`
 query ($projectId: String!)  {
   deployments(projectId: $projectId) {
     id
-    domain{
-      branch
-      createdAt
-      id
-      name
-      status
-      updatedAt
-    }
     branch
     commitHash
     commitMessage
@@ -343,3 +325,15 @@ query ($txHash: String!, $amount: String!, $senderAddress: String!) {
   verifyTx(txHash: $txHash, amount: $amount, senderAddress: $senderAddress)
 }
 `;
+
+export const getLatestDNSRecordByProjectId = gql`
+query($projectId: String!) {
+  latestDNSRecord(projectId: $projectId) {
+    name
+    value
+    request
+    resourceType
+    version
+  }
+}
+`;

packages/gql-client/src/types.ts

@@ -99,7 +99,6 @@ export type User = {
 
 export type Deployment = {
   id: string;
-  domain: Domain;
   branch: string;
   commitHash: string;
   commitMessage: string;
@@ -108,6 +107,7 @@ export type Deployment = {
   environment: Environment;
   isCurrent: boolean;
   baseDomain?: string;
+  applicationDeploymentRecordData: AppDeploymentRecordAttributes;
   status: DeploymentStatus;
   createdBy: User;
   createdAt: string;
@@ -376,3 +376,28 @@ export type AuctionParams = {
   maxPrice: string;
   numProviders: number;
 };
+
+export type DNSRecordAttributes = {
+  name: string;
+  value: string;
+  request: string;
+  resourceType: string;
+  version: string;
+}
+
+export type GetLatestDNSDataResponse = {
+  latestDNSRecord: DNSRecordAttributes | null
+}
+
+export interface AppDeploymentRecordAttributes {
+  application: string;
+  auction: string;
+  deployer: string;
+  dns: string;
+  meta: string;
+  name: string;
+  request: string;
+  type: string;
+  url: string;
+  version: string;
+}

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