From 0f18bc978e5e231113ad7d6de5e874855ec395b0 Mon Sep 17 00:00:00 2001 From: nabarun Date: Tue, 29 Oct 2024 09:12:39 +0000 Subject: [PATCH] Pass payment tx hash in deployment request (#19) Part of [Service provider auctions for web deployments](https://www.notion.so/Service-provider-auctions-for-web-deployments-104a6b22d47280dbad51d28aa3a91d75) Co-authored-by: IshaVenikar Reviewed-on: https://git.vdb.to/cerc-io/snowballtools-base/pulls/19 --- packages/backend/src/entity/Deployer.ts | 3 + packages/backend/src/entity/Deployment.ts | 8 +- packages/backend/src/entity/Project.ts | 8 +- packages/backend/src/registry.ts | 48 ++++++---- packages/backend/src/schema.gql | 1 + packages/backend/src/service.ts | 89 ++++++++++++++----- .../components/projects/create/Configure.tsx | 16 ++-- packages/gql-client/src/client.ts | 4 +- 8 files changed, 121 insertions(+), 56 deletions(-) diff --git a/packages/backend/src/entity/Deployer.ts b/packages/backend/src/entity/Deployer.ts index 4328a122..d9e1b600 100644 --- a/packages/backend/src/entity/Deployer.ts +++ b/packages/backend/src/entity/Deployer.ts @@ -18,6 +18,9 @@ export class Deployer { @Column('varchar', { nullable: true }) minimumPayment!: string | null; + @Column('varchar', { nullable: true }) + paymentAddress!: string | null; + @ManyToMany(() => Project, (project) => project.deployers) projects!: Project[]; } diff --git a/packages/backend/src/entity/Deployment.ts b/packages/backend/src/entity/Deployment.ts index 5efb28b4..5c772b32 100644 --- a/packages/backend/src/entity/Deployment.ts +++ b/packages/backend/src/entity/Deployment.ts @@ -38,19 +38,17 @@ export interface ApplicationDeploymentRequest { auction?: string; config: string; meta: string; + payment?: string; } export interface ApplicationDeploymentRemovalRequest { type: string; version: string; deployment: string; + auction?: string; + payment?: string; } -export interface ApplicationDeploymentRemovalRequest { - type: string; - version: string; - deployment: string; -} export interface ApplicationRecord { type: string; diff --git a/packages/backend/src/entity/Project.ts b/packages/backend/src/entity/Project.ts index aa622dd7..a27b0f06 100644 --- a/packages/backend/src/entity/Project.ts +++ b/packages/backend/src/entity/Project.ts @@ -52,6 +52,10 @@ export class Project { @Column('varchar', { nullable: true }) auctionId!: string | null; + // Tx hash for sending coins from snowball to deployer + @Column('varchar', { nullable: true }) + txHash!: string | null; + @ManyToMany(() => Deployer, (deployer) => (deployer.projects)) @JoinTable() deployers!: Deployer[] @@ -66,12 +70,10 @@ export class Project { @Column('varchar', { nullable: true }) framework!: string | null; + // Address of the user who created the project i.e. requested deployments @Column('varchar') paymentAddress!: string; - @Column('varchar') - txHash!: string; - @Column({ type: 'simple-array' }) diff --git a/packages/backend/src/registry.ts b/packages/backend/src/registry.ts index 9f3b314c..43d9c988 100644 --- a/packages/backend/src/registry.ts +++ b/packages/backend/src/registry.ts @@ -5,8 +5,8 @@ import { Octokit } from 'octokit'; import { inc as semverInc } from 'semver'; import { DeepPartial } from 'typeorm'; -import { Account, Registry as LaconicRegistry, getGasPrice, parseGasAndFees } from '@cerc-io/registry-sdk'; -import { IndexedTx } from '@cosmjs/stargate'; +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'; import { @@ -244,10 +244,11 @@ export class Registry { deployment: Deployment, appName: string, repository: string, - auctionId?: string, + auctionId?: string | null, lrn: string, environmentVariables: { [key: string]: string }, dns: string, + payment?: string | null }): Promise<{ applicationDeploymentRequestId: string; applicationDeploymentRequestData: ApplicationDeploymentRequest; @@ -281,6 +282,7 @@ export class Registry { }), deployer: data.lrn, ...(data.auctionId && { auction: data.auctionId }), + ...(data.payment && { payment: data.payment }), }; await sleep(SLEEP_DURATION); @@ -322,7 +324,11 @@ export class Registry { paymentAddress: auctionWinner, }); - for (const record of records) { + const newRecords = records.filter(record => { + return record.names !== null && record.names.length > 0; + }); + + for (const record of newRecords) { if (record.id) { deployerRecords.push(record); break; @@ -428,6 +434,8 @@ export class Registry { async createApplicationDeploymentRemovalRequest(data: { deploymentId: string; deployerLrn: string; + auctionId?: string | null; + payment?: string | null; }): Promise<{ applicationDeploymentRemovalRequestId: string; applicationDeploymentRemovalRequestData: ApplicationDeploymentRemovalRequest; @@ -436,7 +444,9 @@ export class Registry { type: APP_DEPLOYMENT_REMOVAL_REQUEST_TYPE, version: '1.0.0', deployment: data.deploymentId, - deployer: data.deployerLrn + deployer: data.deployerLrn, + ...(data.auctionId && { auction: data.auctionId }), + ...(data.payment && { payment: data.payment }), }; const fee = parseGasAndFees(this.registryConfig.fee.gas, this.registryConfig.fee.fees); @@ -484,19 +494,23 @@ export class Registry { return this.registry.getAuctionsByIds([auctionId]); } - async sendTokensToAccount(receiverAddress: string, amount: string): Promise { + async sendTokensToAccount(receiverAddress: string, amount: string): Promise { const fee = parseGasAndFees(this.registryConfig.fee.gas, this.registryConfig.fee.fees); - await registryTransactionWithRetry(() => - this.registry.sendCoins( - { - amount, - denom: 'alnt', - destinationAddress: receiverAddress - }, - this.registryConfig.privateKey, - fee - ) - ); + const account = await this.getAccount(); + const laconicClient = await this.registry.getLaconicClient(account); + const txResponse: DeliverTxResponse = + await registryTransactionWithRetry(() => + laconicClient.sendTokens(account.address, receiverAddress, + [ + { + denom: 'alnt', + amount + } + ], + fee || DEFAULT_GAS_ESTIMATION_MULTIPLIER) + ); + + return txResponse; } async getAccount(): Promise { diff --git a/packages/backend/src/schema.gql b/packages/backend/src/schema.gql index 3f7a615d..b8a292a6 100644 --- a/packages/backend/src/schema.gql +++ b/packages/backend/src/schema.gql @@ -140,6 +140,7 @@ type Deployer { deployerId: String! deployerApiUrl: String! minimumPayment: String + paymentAddress: String createdAt: String! updatedAt: String! } diff --git a/packages/backend/src/service.ts b/packages/backend/src/service.ts index e697b663..b142ad67 100644 --- a/packages/backend/src/service.ts +++ b/packages/backend/src/service.ts @@ -648,7 +648,9 @@ export class Service { repository: repoUrl, environmentVariables: environmentVariablesObj, dns: `${newDeployment.project.name}`, - lrn: deployer!.deployerLrn! + lrn: deployer!.deployerLrn!, + payment: data.project.txHash, + auctionId: data.project.auctionId }); } @@ -660,6 +662,8 @@ export class Service { lrn: deployer!.deployerLrn!, environmentVariables: environmentVariablesObj, dns: `${newDeployment.project.name}-${newDeployment.id}`, + payment: data.project.txHash, + auctionId: data.project.auctionId }); await this.db.updateDeploymentById(newDeployment.id, { @@ -886,21 +890,53 @@ export class Service { per_page: 1, }); - // Create deployment with prod branch and latest commit - const deploymentData = { - project, - branch: project.prodBranch, - environment: Environment.Production, - domain: null, - commitHash: latestCommit.sha, - commitMessage: latestCommit.commit.message, - }; - if (auctionParams) { + // Create deployment with prod branch and latest commit + const deploymentData = { + project, + branch: project.prodBranch, + environment: Environment.Production, + domain: null, + commitHash: latestCommit.sha, + commitMessage: latestCommit.commit.message, + }; const { applicationDeploymentAuctionId } = await this.laconicRegistry.createApplicationDeploymentAuction(repo, octokit, auctionParams!, deploymentData); await this.updateProject(project.id, { auctionId: applicationDeploymentAuctionId }); } else { - const newDeployment = await this.createDeployment(user.id, octokit, deploymentData, lrn); + const deployer = await this.db.getDeployerByLRN(lrn!); + + if (!deployer) { + log('Invalid deployer LRN'); + return; + } + + if (deployer.minimumPayment && project.txHash) { + const amountToBePaid = deployer?.minimumPayment.replace(/\D/g, '').toString(); + + const txResponse = await this.laconicRegistry.sendTokensToAccount( + deployer?.paymentAddress!, + amountToBePaid + ); + + const txHash = txResponse.transactionHash; + if (txHash) { + await this.updateProject(project.id, { txHash }); + project.txHash = txHash; + log('Funds transferrend to deployer'); + } + } + + const deploymentData = { + project, + branch: project.prodBranch, + environment: Environment.Production, + domain: null, + commitHash: latestCommit.sha, + commitMessage: latestCommit.commit.message, + deployer + }; + + const newDeployment = await this.createDeployment(user.id, octokit, deploymentData); // Update project with deployer await this.updateProjectWithDeployer(newDeployment.projectId, newDeployment.deployer); } @@ -1141,14 +1177,18 @@ export class Service { await this.laconicRegistry.createApplicationDeploymentRemovalRequest({ deploymentId: latestRecord.id, - deployerLrn: deployment.deployer.deployerLrn + deployerLrn: deployment.deployer.deployerLrn, + auctionId: deployment.project.auctionId, + payment: deployment.project.txHash }); } const result = await this.laconicRegistry.createApplicationDeploymentRemovalRequest({ deploymentId: deployment.applicationDeploymentRecordId, - deployerLrn: deployment.deployer.deployerLrn + deployerLrn: deployment.deployer.deployerLrn, + auctionId: deployment.project.auctionId, + payment: deployment.project.txHash }); await this.db.updateDeploymentById(deployment.id, { @@ -1342,18 +1382,21 @@ export class Service { } const auction = await this.getAuctionData(project.auctionId); + const totalAuctionPrice = Number(auction.maxPrice.quantity) * auction.numProviders; let amountToBeReturned; if (winningDeployersPresent) { - amountToBeReturned = auction.winnerPrice * auction.numProviders; + amountToBeReturned = totalAuctionPrice - auction.winnerAddresses.length * Number(auction.winnerPrice.quantity); } else { - amountToBeReturned = auction.maxPrice * auction.numProviders; + amountToBeReturned = totalAuctionPrice; } - await this.laconicRegistry.sendTokensToAccount( - project.paymentAddress, - amountToBeReturned.toString() - ); + if (amountToBeReturned !== 0) { + await this.laconicRegistry.sendTokensToAccount( + project.paymentAddress, + amountToBeReturned.toString() + ); + } } async getDeployers(): Promise { @@ -1384,7 +1427,8 @@ export class Service { const deployerId = record.id; const deployerLrn = record.names[0]; const deployerApiUrl = record.attributes.apiUrl; - const minimumPayment = record.attributes.minimumPayment + const minimumPayment = record.attributes.minimumPayment; + const paymentAddress = record.attributes.paymentAddress; const baseDomain = deployerApiUrl.substring(deployerApiUrl.indexOf('.') + 1); const deployerData = { @@ -1392,7 +1436,8 @@ export class Service { deployerId, deployerApiUrl, baseDomain, - minimumPayment + minimumPayment, + paymentAddress }; // TODO: Update deployers table in a separate job diff --git a/packages/frontend/src/components/projects/create/Configure.tsx b/packages/frontend/src/components/projects/create/Configure.tsx index 711b448b..f4cd0092 100644 --- a/packages/frontend/src/components/projects/create/Configure.tsx +++ b/packages/frontend/src/components/projects/create/Configure.tsx @@ -173,17 +173,13 @@ const Configure = () => { const handleFormSubmit = useCallback( async (createFormData: FieldValues) => { - if (!selectedAccount) { - return; - } - - const senderAddress = selectedAccount; const deployerLrn = createFormData.lrn; const deployer = deployers.find( (deployer) => deployer.deployerLrn === deployerLrn, ); let amount: string; + let senderAddress: string; let txHash: string; if (createFormData.option === 'LRN' && !deployer?.minimumPayment) { toast({ @@ -194,7 +190,12 @@ const Configure = () => { }); txHash = ''; + senderAddress = ''; } else { + if (!selectedAccount) return; + + senderAddress = selectedAccount.split(':')[2]; + if (createFormData.option === 'LRN') { amount = deployer?.minimumPayment!; } else { @@ -220,8 +221,9 @@ const Configure = () => { const isTxHashValid = await verifyTx( senderAddress, txHash, - amount.toString(), + amountToBePaid.toString(), ); + if (isTxHashValid === false) { console.error('Invalid Tx hash', txHash); return; @@ -243,7 +245,7 @@ const Configure = () => { const projectId = await createProject( createFormData, environmentVariables, - senderAddress.split(':')[2], + senderAddress, txHash, ); diff --git a/packages/gql-client/src/client.ts b/packages/gql-client/src/client.ts index 201f9fcb..c915dde9 100644 --- a/packages/gql-client/src/client.ts +++ b/packages/gql-client/src/client.ts @@ -442,7 +442,7 @@ export class GQLClient { } async verifyTx(txHash: string, amount: string, senderAddress: string): Promise { - const { data: verifyTx } = await this.client.query({ + const { data } = await this.client.query({ query: queries.verifyTx, variables: { txHash, @@ -451,6 +451,6 @@ export class GQLClient { } }); - return verifyTx; + return data.verifyTx; } }