Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ export interface IJob extends IBase {
chainId: number;
fee: number;
fundAmount: number;
escrowAddress: string;
escrowAddress: string | null;
manifestUrl: string;
manifestHash: string;
status: JobStatus;
failedReason?: string;
retriesCount?: number;
failedReason: string | null;
retriesCount: number;
waitUntil: Date;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
import { MigrationInterface, QueryRunner } from 'typeorm';

export class RemoveNullableFromJobEntity1748612934037
implements MigrationInterface
{
name = 'RemoveNullableFromJobEntity1748612934037';

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`
DROP INDEX "hmt"."IDX_59f6c552b618c432f019500e7c"
`);
await queryRunner.query(`
ALTER TABLE "hmt"."jobs"
ALTER COLUMN "chain_id"
SET NOT NULL
`);
await queryRunner.query(`
ALTER TABLE "hmt"."jobs"
ALTER COLUMN "reputation_oracle"
SET NOT NULL
`);
await queryRunner.query(`
ALTER TABLE "hmt"."jobs"
ALTER COLUMN "exchange_oracle"
SET NOT NULL
`);
await queryRunner.query(`
ALTER TABLE "hmt"."jobs"
ALTER COLUMN "recording_oracle"
SET NOT NULL
`);
await queryRunner.query(`
CREATE UNIQUE INDEX "IDX_59f6c552b618c432f019500e7c" ON "hmt"."jobs" ("chain_id", "escrow_address")
Comment thread
dnechay marked this conversation as resolved.
`);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`
DROP INDEX "hmt"."IDX_59f6c552b618c432f019500e7c"
`);
await queryRunner.query(`
ALTER TABLE "hmt"."jobs"
ALTER COLUMN "recording_oracle" DROP NOT NULL
`);
await queryRunner.query(`
ALTER TABLE "hmt"."jobs"
ALTER COLUMN "exchange_oracle" DROP NOT NULL
`);
await queryRunner.query(`
ALTER TABLE "hmt"."jobs"
ALTER COLUMN "reputation_oracle" DROP NOT NULL
`);
await queryRunner.query(`
ALTER TABLE "hmt"."jobs"
ALTER COLUMN "chain_id" DROP NOT NULL
`);
await queryRunner.query(`
CREATE UNIQUE INDEX "IDX_59f6c552b618c432f019500e7c" ON "hmt"."jobs" ("chain_id", "escrow_address")
`);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -265,10 +265,11 @@ export class CronJobService {
for (const jobEntity of jobEntities) {
try {
if (
await this.jobService.isEscrowFunded(
jobEntity.escrowAddress &&
(await this.jobService.isEscrowFunded(
jobEntity.chainId,
jobEntity.escrowAddress,
)
))
) {
const { amountRefunded } =
await this.jobService.processEscrowCancellation(jobEntity);
Expand Down
161 changes: 161 additions & 0 deletions packages/apps/job-launcher/server/src/modules/job/fixtures.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,161 @@
import { faker } from '@faker-js/faker';
import { ChainId } from '@human-protocol/sdk';
import {
getMockedProvider,
getMockedRegion,
} from '../../../test/fixtures/storage';
import {
AudinoJobType,
CvatJobType,
EscrowFundToken,
FortuneJobType,
JobCaptchaShapeType,
} from '../../common/enums/job';
import { PaymentCurrency } from '../../common/enums/payment';
import {
JobAudinoDto,
JobCaptchaDto,
JobCvatDto,
JobFortuneDto,
} from './job.dto';
import { JobEntity } from './job.entity';
import { JobStatus } from '../../common/enums/job';

export const createFortuneJobDto = (overrides = {}): JobFortuneDto => ({
chainId: ChainId.POLYGON_AMOY,
submissionsRequired: faker.number.int({ min: 1, max: 10 }),
requesterTitle: faker.lorem.words(3),
requesterDescription: faker.lorem.sentence(),
paymentAmount: faker.number.float({ min: 1, max: 100, fractionDigits: 6 }),
paymentCurrency: faker.helpers.arrayElement(Object.values(PaymentCurrency)),
escrowFundToken: faker.helpers.arrayElement(Object.values(EscrowFundToken)),
exchangeOracle: faker.finance.ethereumAddress(),
recordingOracle: faker.finance.ethereumAddress(),
reputationOracle: faker.finance.ethereumAddress(),
...overrides,
});

export const createCvatJobDto = (overrides = {}): JobCvatDto => ({
chainId: ChainId.POLYGON_AMOY,
data: {
dataset: {
provider: getMockedProvider(),
region: getMockedRegion(),
bucketName: faker.lorem.word(),
path: faker.system.filePath(),
},
},
labels: [{ name: faker.lorem.word(), nodes: [faker.string.uuid()] }],
requesterDescription: faker.lorem.sentence(),
userGuide: faker.internet.url(),
minQuality: faker.number.float({ min: 0.1, max: 1 }),
groundTruth: {
provider: getMockedProvider(),
region: getMockedRegion(),
bucketName: faker.lorem.word(),
path: faker.system.filePath(),
},
type: faker.helpers.arrayElement(Object.values(CvatJobType)),
paymentCurrency: faker.helpers.arrayElement(Object.values(PaymentCurrency)),
paymentAmount: faker.number.int({ min: 1, max: 1000 }),
escrowFundToken: faker.helpers.arrayElement(Object.values(EscrowFundToken)),
exchangeOracle: faker.finance.ethereumAddress(),
recordingOracle: faker.finance.ethereumAddress(),
reputationOracle: faker.finance.ethereumAddress(),
...overrides,
});

export const createAudinoJobDto = (overrides = {}): JobAudinoDto => ({
chainId: ChainId.POLYGON_AMOY,
data: {
dataset: {
provider: getMockedProvider(),
region: getMockedRegion(),
bucketName: faker.lorem.word(),
path: faker.system.filePath(),
},
},
groundTruth: {
provider: getMockedProvider(),
region: getMockedRegion(),
bucketName: faker.lorem.word(),
path: faker.system.filePath(),
},
labels: [{ name: faker.lorem.word() }],
segmentDuration: faker.number.int({ min: 10, max: 100 }),
requesterDescription: faker.lorem.sentence(),
userGuide: faker.internet.url(),
qualifications: [faker.lorem.word()],
minQuality: faker.number.int({ min: 1, max: 100 }),
type: AudinoJobType.AUDIO_TRANSCRIPTION,
paymentCurrency: faker.helpers.arrayElement(Object.values(PaymentCurrency)),
paymentAmount: faker.number.int({ min: 1, max: 1000 }),
escrowFundToken: faker.helpers.arrayElement(Object.values(EscrowFundToken)),
exchangeOracle: faker.finance.ethereumAddress(),
recordingOracle: faker.finance.ethereumAddress(),
reputationOracle: faker.finance.ethereumAddress(),
...overrides,
});

export const createCaptchaJobDto = (overrides = {}): JobCaptchaDto => ({
chainId: ChainId.POLYGON_AMOY,
data: {
provider: getMockedProvider(),
region: getMockedRegion(),
bucketName: faker.lorem.word(),
path: faker.system.filePath(),
},
accuracyTarget: faker.number.float({ min: 0.1, max: 1, fractionDigits: 4 }),
minRequests: faker.number.int({ min: 1, max: 5 }),
maxRequests: faker.number.int({ min: 6, max: 10 }),
annotations: {
typeOfJob: faker.helpers.arrayElement(Object.values(JobCaptchaShapeType)),
labelingPrompt: faker.lorem.sentence(),
groundTruths: faker.internet.url(),
exampleImages: [faker.internet.url(), faker.internet.url()],
taskBidPrice: faker.number.float({ min: 0.1, max: 10, fractionDigits: 6 }),
label: faker.lorem.word(),
},
completionDate: faker.date.future(),
paymentCurrency: faker.helpers.arrayElement(Object.values(PaymentCurrency)),
paymentAmount: faker.number.int({ min: 1, max: 1000 }),
escrowFundToken: faker.helpers.arrayElement(Object.values(EscrowFundToken)),
exchangeOracle: faker.finance.ethereumAddress(),
recordingOracle: faker.finance.ethereumAddress(),
reputationOracle: faker.finance.ethereumAddress(),
advanced: {},
...overrides,
});

export const createJobEntity = (
overrides: Partial<JobEntity> = {},
): JobEntity => {
const entity = new JobEntity();
entity.id = faker.number.int();
entity.chainId = ChainId.POLYGON_AMOY;
entity.reputationOracle = faker.finance.ethereumAddress();
entity.exchangeOracle = faker.finance.ethereumAddress();
entity.recordingOracle = faker.finance.ethereumAddress();
entity.escrowAddress = faker.finance.ethereumAddress();
entity.fee = faker.number.float({ min: 0.01, max: 1, fractionDigits: 6 });
entity.fundAmount = faker.number.float({
min: 1,
max: 1000,
fractionDigits: 6,
});
entity.token = faker.helpers.arrayElement(
Object.values(EscrowFundToken),
) as EscrowFundToken;
entity.manifestUrl = faker.internet.url();
entity.manifestHash = faker.string.uuid();
entity.failedReason = null;
entity.requestType = FortuneJobType.FORTUNE;
entity.status = faker.helpers.arrayElement(Object.values(JobStatus));
entity.userId = faker.number.int();
entity.payments = [];
entity.contentModerationRequests = [];
entity.retriesCount = faker.number.int({ min: 0, max: 4 });
entity.waitUntil = faker.date.future();
Object.assign(entity, overrides);
return entity;
};
12 changes: 6 additions & 6 deletions packages/apps/job-launcher/server/src/modules/job/job.entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@ import { ContentModerationRequestEntity } from '../content-moderation/content-mo
@Entity({ schema: NS, name: 'jobs' })
@Index(['chainId', 'escrowAddress'], { unique: true })
export class JobEntity extends BaseEntity implements IJob {
@Column({ type: 'int', nullable: true })
@Column({ type: 'int' })
public chainId: number;

@Column({ type: 'varchar', nullable: true })
@Column({ type: 'varchar' })
public reputationOracle: string;

@Column({ type: 'varchar', nullable: true })
@Column({ type: 'varchar' })
public exchangeOracle: string;

@Column({ type: 'varchar', nullable: true })
@Column({ type: 'varchar' })
public recordingOracle: string;

@Column({ type: 'varchar', nullable: true })
public escrowAddress: string;
public escrowAddress: string | null;

@Column({ type: 'decimal', precision: 30, scale: 18 })
public fee: number;
Expand All @@ -42,7 +42,7 @@ export class JobEntity extends BaseEntity implements IJob {
public manifestHash: string;

@Column({ type: 'varchar', nullable: true })
public failedReason: string;
public failedReason: string | null;

@Column({
type: 'enum',
Expand Down
Loading