fix: add/del currency

package.json

@@ -1,6 +1,6 @@
 {
   "name": "unique-marketplace-backend",
-  "version": "3.0.261",
+  "version": "3.0.262",
   "description": "Backend project for unique marketplace",
   "author": "Unique Network",
   "private": true,

packages/common/modules/database/services/settings.service.ts

@@ -57,6 +57,26 @@ export class SettingsService {
     return this.setValue('contract_currencies', JSON.stringify(currencies));
   }
 
+  public async addContractCurrency(currency: CurrencyDto): Promise<void> {
+    const currencies = await this.getContractCurrencies();
+    const found = currencies.find((c) => c.collectionId === currency.collectionId);
+    if (found) {
+      found.iconUrl = currency.iconUrl;
+      found.decimals = currency.decimals;
+      found.fee = currency.fee;
+    } else {
+      currencies.push(currency);
+    }
+    return this.setContractCurrencies(currencies);
+  }
+
+  public async removeContractCurrency(collectionId: number): Promise<void> {
+    const currencies = await this.getContractCurrencies();
+    const newCurrencies = currencies.filter((c) => c.collectionId !== collectionId);
+
+    return this.setContractCurrencies(newCurrencies);
+  }
+
   public async getContractCurrencies(): Promise<CurrencyDto[]> {
     const value = await this.getValue('contract_currencies');
     return value ? JSON.parse(value) : [];

packages/market/src/contracts/contract.controller.ts

@@ -5,7 +5,7 @@ import { readApiDocs } from '../utils/utils';
 import { ContractsService } from './contracts.service';
 import { CheckApprovedDto } from './dto/check-approved.dto';
 import { ApiBearerAuthMetamaskAndSubstrate } from '../admin/decorators/login.decorator';
-import { SetCurrenciesDto } from './dto/set-currencies.dto';
+import { RemoveCurrencyDto, SetCurrenciesDto } from './dto/set-currencies.dto';
 
 @ApiTags('Contracts')
 @Controller('contracts')
@@ -34,12 +34,21 @@ export class ContractsController extends BaseController<ContractsService> {
     return this.contractsService.getAllAbi();
   }
 
-  @Post('/currencies')
+  @Post('/currencies/add')
   @HttpCode(HttpStatus.OK)
   @ApiOperation({
-    summary: 'Set available currencies',
+    summary: 'Add available currency',
   })
-  setCurrencies(@Body() dto: SetCurrenciesDto) {
-    return this.contractsService.setCurrencies(dto);
+  addCurrency(@Body() dto: SetCurrenciesDto) {
+    return this.contractsService.addCurrency(dto);
+  }
+
+  @Post('/currencies/del')
+  @HttpCode(HttpStatus.OK)
+  @ApiOperation({
+    summary: 'Add available currency',
+  })
+  delCurrency(@Body() dto: RemoveCurrencyDto) {
+    return this.contractsService.delCurrency(dto);
   }
 }

packages/market/src/contracts/contracts.service.ts

@@ -8,7 +8,7 @@ import { CheckApprovedDto } from './dto/check-approved.dto';
 import { getContractAbi } from '@app/contracts/scripts';
 import { Market } from '@app/contracts/assemblies/3/market';
 import { OfferStatus } from '@app/common/modules/types';
-import { SetCurrenciesDto } from './dto/set-currencies.dto';
+import { RemoveCurrencyDto, SetCurrenciesDto } from './dto/set-currencies.dto';
 
 interface ContractEventValue {
   item: Market.OrderStructOutput;
@@ -115,11 +115,24 @@ export class ContractsService {
     }, {});
   }
 
-  public async setCurrencies(dto: SetCurrenciesDto): Promise<any> {
-    const { contractAddress, currencies } = dto;
+  public async delCurrency(dto: RemoveCurrencyDto): Promise<void> {
+    const { collectionId, contractAddress } = dto;
+    await this.settingsService.removeContractCurrency(collectionId);
+    await this.currencyCall(contractAddress, 'removeCurrency', { collectionId });
+  }
+  public async addCurrency(dto: SetCurrenciesDto): Promise<void> {
+    const { currency, contractAddress } = dto;
+    await this.settingsService.addContractCurrency(currency);
 
-    await this.settingsService.setContractCurrencies(currencies);
+    const { collectionId, fee, decimals } = currency;
+    await this.currencyCall(contractAddress, 'addCurrency', {
+      collectionId,
+      decimals,
+      fee,
+    });
+  }
 
+  private async currencyCall(contractAddress: string, method: string, args: any): Promise<any> {
     const contractEntity = await this.contractService.findOne({
       where: {
         address: contractAddress,
@@ -138,11 +151,10 @@ export class ContractsService {
 
     const callArgs = {
       address: this.sdk.options.signer.address,
-      funcName: 'setCurrencies',
-      args: {
-        currencies,
-      },
+      funcName: method,
+      args: args,
     };
+
     try {
       await contract.call(callArgs);
     } catch (err) {

packages/market/src/contracts/dto/set-currencies.dto.ts

@@ -1,7 +1,17 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { IsArray, IsNumber, IsString, ValidateNested } from 'class-validator';
+import { IsNumber, IsObject, IsString, ValidateNested } from 'class-validator';
 import { Type } from 'class-transformer';
 
+export class RemoveCurrencyDto {
+  @ApiProperty()
+  @IsNumber()
+  collectionId: number;
+
+  @ApiProperty()
+  @IsString()
+  contractAddress: string;
+}
+
 export class CurrencyDto {
   @ApiProperty()
   @IsNumber()
@@ -14,14 +24,18 @@ export class CurrencyDto {
   @ApiProperty()
   @IsString()
   iconUrl: string;
+
+  @ApiProperty()
+  @IsNumber()
+  fee: number;
 }
 
 export class SetCurrenciesDto {
-  @ApiProperty({ type: CurrencyDto, isArray: true })
+  @ApiProperty({ type: CurrencyDto })
   @Type(() => CurrencyDto)
-  @IsArray()
-  @ValidateNested({ each: true })
-  currencies: CurrencyDto[];
+  @IsObject()
+  @ValidateNested()
+  currency: CurrencyDto;
 
   @ApiProperty()
   @IsString()