diff --git a/package.json b/package.json index 0745da4202..dcd3d64c08 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "lerna": "6.6.2", "lint-staged": "10.5.4", "npm-package-json-lint": "5.1.0", - "prettier": "3.0.3", + "prettier": "2.8.8", "prettier-plugin-solidity": "1.0.0-beta.19", "typescript": "5.1.3" }, diff --git a/packages/advanced-logic/src/extensions/content-data.ts b/packages/advanced-logic/src/extensions/content-data.ts index 30529aa3f5..5c9bab5d96 100644 --- a/packages/advanced-logic/src/extensions/content-data.ts +++ b/packages/advanced-logic/src/extensions/content-data.ts @@ -7,8 +7,7 @@ const CURRENT_VERSION = '0.1.0'; * Implementation of the content data extension */ export default class ContentDataExtension< - TCreationParameters extends - ExtensionTypes.ContentData.ICreationParameters = ExtensionTypes.ContentData.ICreationParameters, + TCreationParameters extends ExtensionTypes.ContentData.ICreationParameters = ExtensionTypes.ContentData.ICreationParameters, > extends AbstractExtension { public constructor() { super(ExtensionTypes.TYPE.CONTENT_DATA, ExtensionTypes.ID.CONTENT_DATA, CURRENT_VERSION); diff --git a/packages/advanced-logic/src/extensions/payment-network/address-based.ts b/packages/advanced-logic/src/extensions/payment-network/address-based.ts index eb38c466ff..39a4f9949c 100644 --- a/packages/advanced-logic/src/extensions/payment-network/address-based.ts +++ b/packages/advanced-logic/src/extensions/payment-network/address-based.ts @@ -13,8 +13,7 @@ import DeclarativePaymentNetwork from './declarative'; * This module is called by the address based payment networks to avoid code redundancy */ export default abstract class AddressBasedPaymentNetwork< - TCreationParameters extends - ExtensionTypes.PnAddressBased.ICreationParameters = ExtensionTypes.PnAddressBased.ICreationParameters, + TCreationParameters extends ExtensionTypes.PnAddressBased.ICreationParameters = ExtensionTypes.PnAddressBased.ICreationParameters, > extends DeclarativePaymentNetwork { protected constructor( protected currencyManager: CurrencyTypes.ICurrencyManager, diff --git a/packages/advanced-logic/src/extensions/payment-network/declarative.ts b/packages/advanced-logic/src/extensions/payment-network/declarative.ts index e453719a4e..634f21cc7a 100644 --- a/packages/advanced-logic/src/extensions/payment-network/declarative.ts +++ b/packages/advanced-logic/src/extensions/payment-network/declarative.ts @@ -8,8 +8,7 @@ const CURRENT_VERSION = '0.1.0'; * Core of the declarative payment network */ export default class DeclarativePaymentNetwork< - TCreationParameters extends - ExtensionTypes.PnAnyDeclarative.ICreationParameters = ExtensionTypes.PnAnyDeclarative.ICreationParameters, + TCreationParameters extends ExtensionTypes.PnAnyDeclarative.ICreationParameters = ExtensionTypes.PnAnyDeclarative.ICreationParameters, > extends AbstractExtension { public constructor( public readonly extensionId: ExtensionTypes.PAYMENT_NETWORK_ID = ExtensionTypes diff --git a/packages/advanced-logic/src/extensions/payment-network/erc20/fee-proxy-contract.ts b/packages/advanced-logic/src/extensions/payment-network/erc20/fee-proxy-contract.ts index 8f62ba49f2..c36ba940ba 100644 --- a/packages/advanced-logic/src/extensions/payment-network/erc20/fee-proxy-contract.ts +++ b/packages/advanced-logic/src/extensions/payment-network/erc20/fee-proxy-contract.ts @@ -10,8 +10,7 @@ const NEAR_CURRENT_VERSION = 'NEAR-0.1.0'; * Implementation of the payment network to pay in ERC20, including third-party fees payment, based on a reference provided to a proxy contract. */ export default class Erc20FeeProxyPaymentNetwork< - TCreationParameters extends - ExtensionTypes.PnFeeReferenceBased.ICreationParameters = ExtensionTypes.PnFeeReferenceBased.ICreationParameters, + TCreationParameters extends ExtensionTypes.PnFeeReferenceBased.ICreationParameters = ExtensionTypes.PnFeeReferenceBased.ICreationParameters, > extends FeeReferenceBasedPaymentNetwork { /** * @param network is only relevant for non-EVM chains (Near and Near testnet) diff --git a/packages/advanced-logic/src/extensions/payment-network/erc20/proxy-contract.ts b/packages/advanced-logic/src/extensions/payment-network/erc20/proxy-contract.ts index ce99eb33cf..3651ec5cf7 100644 --- a/packages/advanced-logic/src/extensions/payment-network/erc20/proxy-contract.ts +++ b/packages/advanced-logic/src/extensions/payment-network/erc20/proxy-contract.ts @@ -7,8 +7,7 @@ const CURRENT_VERSION = '0.1.0'; * Implementation of the payment network to pay in ERC20 based on a reference provided to a proxy contract. */ export default class Erc20ProxyPaymentNetwork< - TCreationParameters extends - ExtensionTypes.PnReferenceBased.ICreationParameters = ExtensionTypes.PnReferenceBased.ICreationParameters, + TCreationParameters extends ExtensionTypes.PnReferenceBased.ICreationParameters = ExtensionTypes.PnReferenceBased.ICreationParameters, > extends ReferenceBasedPaymentNetwork { public constructor(currencyManager: CurrencyTypes.ICurrencyManager) { super( diff --git a/packages/advanced-logic/src/extensions/payment-network/erc20/transferable-receivable.ts b/packages/advanced-logic/src/extensions/payment-network/erc20/transferable-receivable.ts index 2306769cb2..0e2c5aa77c 100644 --- a/packages/advanced-logic/src/extensions/payment-network/erc20/transferable-receivable.ts +++ b/packages/advanced-logic/src/extensions/payment-network/erc20/transferable-receivable.ts @@ -7,8 +7,7 @@ const CURRENT_VERSION = '0.2.0'; * Implementation of the payment network to pay in ERC20 based on a transferable receivable contract. */ export default class Erc20TransferableReceivablePaymentNetwork< - TCreationParameters extends - ExtensionTypes.PnFeeReferenceBased.ICreationParameters = ExtensionTypes.PnFeeReferenceBased.ICreationParameters, + TCreationParameters extends ExtensionTypes.PnFeeReferenceBased.ICreationParameters = ExtensionTypes.PnFeeReferenceBased.ICreationParameters, > extends FeeReferenceBasedPaymentNetwork { public constructor( currencyManager: CurrencyTypes.ICurrencyManager, diff --git a/packages/advanced-logic/src/extensions/payment-network/erc777/stream.ts b/packages/advanced-logic/src/extensions/payment-network/erc777/stream.ts index 370f5a0f5b..d9e25553bb 100644 --- a/packages/advanced-logic/src/extensions/payment-network/erc777/stream.ts +++ b/packages/advanced-logic/src/extensions/payment-network/erc777/stream.ts @@ -12,8 +12,7 @@ const CURRENT_VERSION = '0.1.0'; * Implementation of the payment network to pay in ERC777, including third-party fees payment, based on a reference provided to a proxy contract. */ export default class Erc777StreamPaymentNetwork< - TCreationParameters extends - ExtensionTypes.PnStreamReferenceBased.ICreationParameters = ExtensionTypes.PnStreamReferenceBased.ICreationParameters, + TCreationParameters extends ExtensionTypes.PnStreamReferenceBased.ICreationParameters = ExtensionTypes.PnStreamReferenceBased.ICreationParameters, > extends ReferenceBasedPaymentNetwork { public constructor(currencyManager: CurrencyTypes.ICurrencyManager) { super( diff --git a/packages/advanced-logic/src/extensions/payment-network/ethereum/fee-proxy-contract.ts b/packages/advanced-logic/src/extensions/payment-network/ethereum/fee-proxy-contract.ts index 0d64909689..cb865d0c7b 100644 --- a/packages/advanced-logic/src/extensions/payment-network/ethereum/fee-proxy-contract.ts +++ b/packages/advanced-logic/src/extensions/payment-network/ethereum/fee-proxy-contract.ts @@ -7,8 +7,7 @@ const CURRENT_VERSION = '0.2.0'; * Implementation of the payment network to pay in Ethereum, including third-party fees payment, based on a reference provided to a proxy contract. */ export default class EthereumFeeProxyPaymentNetwork< - TCreationParameters extends - ExtensionTypes.PnFeeReferenceBased.ICreationParameters = ExtensionTypes.PnFeeReferenceBased.ICreationParameters, + TCreationParameters extends ExtensionTypes.PnFeeReferenceBased.ICreationParameters = ExtensionTypes.PnFeeReferenceBased.ICreationParameters, > extends FeeReferenceBasedPaymentNetwork { public constructor( currencyManager: CurrencyTypes.ICurrencyManager, diff --git a/packages/advanced-logic/src/extensions/payment-network/fee-reference-based.ts b/packages/advanced-logic/src/extensions/payment-network/fee-reference-based.ts index de0a49eaaa..6f5a7aca3f 100644 --- a/packages/advanced-logic/src/extensions/payment-network/fee-reference-based.ts +++ b/packages/advanced-logic/src/extensions/payment-network/fee-reference-based.ts @@ -12,8 +12,7 @@ import { areEqualIdentities, deepCopy, isValidAmount } from '@requestnetwork/uti * This module is called by the fee reference based (ethereum & erc20) payment networks to avoid code redundancy */ export abstract class FeeReferenceBasedPaymentNetwork< - TCreationParameters extends - ExtensionTypes.PnFeeReferenceBased.ICreationParameters = ExtensionTypes.PnFeeReferenceBased.ICreationParameters, + TCreationParameters extends ExtensionTypes.PnFeeReferenceBased.ICreationParameters = ExtensionTypes.PnFeeReferenceBased.ICreationParameters, > extends ReferenceBasedPaymentNetwork { protected constructor( currencyManager: CurrencyTypes.ICurrencyManager, diff --git a/packages/advanced-logic/src/extensions/payment-network/meta.ts b/packages/advanced-logic/src/extensions/payment-network/meta.ts index 24603fe5bc..bdcb846ebd 100644 --- a/packages/advanced-logic/src/extensions/payment-network/meta.ts +++ b/packages/advanced-logic/src/extensions/payment-network/meta.ts @@ -13,8 +13,7 @@ import DeclarativePaymentNetwork from './declarative'; const CURRENT_VERSION = '0.1.0'; export default class MetaPaymentNetwork< - TCreationParameters extends - ExtensionTypes.PnMeta.ICreationParameters = ExtensionTypes.PnMeta.ICreationParameters, + TCreationParameters extends ExtensionTypes.PnMeta.ICreationParameters = ExtensionTypes.PnMeta.ICreationParameters, > extends DeclarativePaymentNetwork { public constructor( protected currencyManager: CurrencyTypes.ICurrencyManager, diff --git a/packages/advanced-logic/src/extensions/payment-network/reference-based.ts b/packages/advanced-logic/src/extensions/payment-network/reference-based.ts index 30dfc5540e..6158f0d5a2 100644 --- a/packages/advanced-logic/src/extensions/payment-network/reference-based.ts +++ b/packages/advanced-logic/src/extensions/payment-network/reference-based.ts @@ -9,8 +9,7 @@ const eightHexRegex = /[0-9a-f]{16,}/; * This module is called by the reference based payment networks to avoid code redundancy */ export default abstract class ReferenceBasedPaymentNetwork< - TCreationParameters extends - ExtensionTypes.PnReferenceBased.ICreationParameters = ExtensionTypes.PnReferenceBased.ICreationParameters, + TCreationParameters extends ExtensionTypes.PnReferenceBased.ICreationParameters = ExtensionTypes.PnReferenceBased.ICreationParameters, > extends AddressBasedPaymentNetwork { /** * Creates the extensionsData to create the payment detection extension diff --git a/packages/data-access/src/data-read.ts b/packages/data-access/src/data-read.ts index 443bb64212..4c2bf5c87c 100644 --- a/packages/data-access/src/data-read.ts +++ b/packages/data-access/src/data-read.ts @@ -127,23 +127,17 @@ export class DataAccessRead implements DataAccessTypes.IDataRead { const filteredTxs = transactions.filter((tx) => channels.includes(tx.channelId)); return { meta: { - storageMeta: filteredTxs.reduce( - (acc, tx) => { - acc[tx.channelId] = [this.toStorageMeta(tx, result.blockNumber, this.network)]; - return acc; - }, - {} as Record, - ), - transactionsStorageLocation: filteredTxs.reduce( - (prev, curr) => { - if (!prev[curr.channelId]) { - prev[curr.channelId] = []; - } - prev[curr.channelId].push(curr.hash); - return prev; - }, - {} as Record, - ), + storageMeta: filteredTxs.reduce((acc, tx) => { + acc[tx.channelId] = [this.toStorageMeta(tx, result.blockNumber, this.network)]; + return acc; + }, {} as Record), + transactionsStorageLocation: filteredTxs.reduce((prev, curr) => { + if (!prev[curr.channelId]) { + prev[curr.channelId] = []; + } + prev[curr.channelId].push(curr.hash); + return prev; + }, {} as Record), pagination: page && pageSize ? { diff --git a/packages/payment-detection/src/balance-error.ts b/packages/payment-detection/src/balance-error.ts index 28ad4dc09a..50fae3f5ed 100644 --- a/packages/payment-detection/src/balance-error.ts +++ b/packages/payment-detection/src/balance-error.ts @@ -1,10 +1,7 @@ import { PaymentTypes, ExtensionTypes } from '@requestnetwork/types'; export class BalanceError extends Error { - constructor( - message: string, - public readonly code: PaymentTypes.BALANCE_ERROR_CODE, - ) { + constructor(message: string, public readonly code: PaymentTypes.BALANCE_ERROR_CODE) { super(message); } } diff --git a/packages/payment-detection/src/types.ts b/packages/payment-detection/src/types.ts index 708a037e72..9faafb0e75 100644 --- a/packages/payment-detection/src/types.ts +++ b/packages/payment-detection/src/types.ts @@ -66,29 +66,27 @@ export interface IEventRetriever< /** Object interface to list the payment network module by id */ export type IPaymentNetworkModuleByType< - TPaymentEventParameters extends - PaymentTypes.GenericEventParameters = PaymentTypes.GenericEventParameters, + TPaymentEventParameters extends PaymentTypes.GenericEventParameters = PaymentTypes.GenericEventParameters, > = Partial< Record< ExtensionTypes.PAYMENT_NETWORK_ID, - new ( - ...pnParams: any - ) => PaymentDetectorBase + new (...pnParams: any) => PaymentDetectorBase< + ExtensionTypes.IExtension, + TPaymentEventParameters + > > >; /** Object interface to list the payment network module by network */ export interface ISupportedPaymentNetworkByNetwork< - TPaymentEventParameters extends - PaymentTypes.GenericEventParameters = PaymentTypes.GenericEventParameters, + TPaymentEventParameters extends PaymentTypes.GenericEventParameters = PaymentTypes.GenericEventParameters, > { [network: string]: IPaymentNetworkModuleByType; } /** Object interface to list the payment network id and its module by currency */ export interface ISupportedPaymentNetworkByCurrency< - TPaymentEventParameters extends - PaymentTypes.GenericEventParameters = PaymentTypes.GenericEventParameters, + TPaymentEventParameters extends PaymentTypes.GenericEventParameters = PaymentTypes.GenericEventParameters, > { [currency: string]: ISupportedPaymentNetworkByNetwork; } diff --git a/packages/payment-detection/src/utils.ts b/packages/payment-detection/src/utils.ts index 36e37bd275..c16b46975b 100644 --- a/packages/payment-detection/src/utils.ts +++ b/packages/payment-detection/src/utils.ts @@ -261,6 +261,6 @@ export const transformNonNull = , TKey extends ({ [key as TKey]: val[key] !== undefined && val[key] !== null ? transform(val[key], key) : undefined, - }) as { + } as { [P in TKey]: TOut; - }; + }); diff --git a/packages/payment-processor/test/payment/shared.ts b/packages/payment-processor/test/payment/shared.ts index 97f170c078..51d8ea7cd7 100644 --- a/packages/payment-processor/test/payment/shared.ts +++ b/packages/payment-processor/test/payment/shared.ts @@ -16,6 +16,6 @@ export const currencyManager = new CurrencyManager([ decimals: 18, symbol: 'ERC20_' + i, type: RequestLogicTypes.CURRENCY.ERC20, - }) as CurrencyTypes.CurrencyDefinition, + } as CurrencyTypes.CurrencyDefinition), ), ]); diff --git a/packages/request-client.js/src/api/request-network.ts b/packages/request-client.js/src/api/request-network.ts index 899168ddd8..05784a37c3 100644 --- a/packages/request-client.js/src/api/request-network.ts +++ b/packages/request-client.js/src/api/request-network.ts @@ -84,8 +84,9 @@ export default class RequestNetwork { parameters: Types.ICreateRequestParameters, options?: Types.ICreateRequestOptions, ): Promise { - const { requestParameters, topics, paymentNetwork } = - await this.prepareRequestParameters(parameters); + const { requestParameters, topics, paymentNetwork } = await this.prepareRequestParameters( + parameters, + ); const requestLogicCreateResult = await this.requestLogic.createRequest( requestParameters, @@ -165,8 +166,9 @@ export default class RequestNetwork { encryptionParams: EncryptionTypes.IEncryptionParameters[], options?: Types.ICreateRequestOptions, ): Promise { - const { requestParameters, topics, paymentNetwork } = - await this.prepareRequestParameters(parameters); + const { requestParameters, topics, paymentNetwork } = await this.prepareRequestParameters( + parameters, + ); const requestLogicCreateResult = await this.requestLogic.createEncryptedRequest( requestParameters, diff --git a/packages/request-client.js/test/index-encryption.html b/packages/request-client.js/test/index-encryption.html index 7b694b74a3..27a1cb388d 100644 --- a/packages/request-client.js/test/index-encryption.html +++ b/packages/request-client.js/test/index-encryption.html @@ -1,4 +1,4 @@ - + @requestnetwork/request-client.js Test Page diff --git a/packages/request-client.js/test/index-metamask.html b/packages/request-client.js/test/index-metamask.html index 4016209716..e54578a740 100644 --- a/packages/request-client.js/test/index-metamask.html +++ b/packages/request-client.js/test/index-metamask.html @@ -1,4 +1,4 @@ - + @requestnetwork/request-client.js Test Page diff --git a/packages/request-client.js/test/index-persist-from-metamask.html b/packages/request-client.js/test/index-persist-from-metamask.html index 9aeea0f72f..68455ef9d4 100644 --- a/packages/request-client.js/test/index-persist-from-metamask.html +++ b/packages/request-client.js/test/index-persist-from-metamask.html @@ -1,4 +1,4 @@ - + @requestnetwork/request-client.js Test Page diff --git a/packages/request-client.js/test/index.html b/packages/request-client.js/test/index.html index a29cc7df7c..ad25beb4b2 100644 --- a/packages/request-client.js/test/index.html +++ b/packages/request-client.js/test/index.html @@ -1,4 +1,4 @@ - + @requestnetwork/request-client.js Test Page diff --git a/packages/request-logic/specs/example/example.ts b/packages/request-logic/specs/example/example.ts index e1a51f23da..69f4915b2f 100644 --- a/packages/request-logic/specs/example/example.ts +++ b/packages/request-logic/specs/example/example.ts @@ -40,7 +40,7 @@ async function foo(): Promise { ({ [aliceRaw.identity.value as string]: sign(data, aliceRaw.signatureParams), [bobRaw.identity.value as string]: sign(data, bobRaw.signatureParams), - })[identity.value], + }[identity.value]), supportedIdentityTypes: [IdentityTypes.TYPE.ETHEREUM_ADDRESS], supportedMethods: [SignatureTypes.METHOD.ECDSA], }; diff --git a/packages/request-logic/src/request-logic.ts b/packages/request-logic/src/request-logic.ts index 7989f5fc83..e25b0456d4 100644 --- a/packages/request-logic/src/request-logic.ts +++ b/packages/request-logic/src/request-logic.ts @@ -511,26 +511,23 @@ export default class RequestLogic implements RequestLogicTypes.IRequestLogic { // second parameter is null, because the first action must be a creation (no state expected) const confirmedRequestState = transactions .filter((action) => action.state === TransactionTypes.TransactionState.CONFIRMED) - .reduce( - (requestState, actionConfirmed) => { - try { - return RequestLogicCore.applyActionToRequest( - requestState, - actionConfirmed.action, - actionConfirmed.timestamp, - this.advancedLogic, - ); - } catch (e) { - // if an error occurs while applying we ignore the action - ignoredTransactionsByApplication.push({ - reason: e.message, - transaction: actionConfirmed, - }); - return requestState; - } - }, - null as RequestLogicTypes.IRequest | null, - ); + .reduce((requestState, actionConfirmed) => { + try { + return RequestLogicCore.applyActionToRequest( + requestState, + actionConfirmed.action, + actionConfirmed.timestamp, + this.advancedLogic, + ); + } catch (e) { + // if an error occurs while applying we ignore the action + ignoredTransactionsByApplication.push({ + reason: e.message, + transaction: actionConfirmed, + }); + return requestState; + } + }, null as RequestLogicTypes.IRequest | null); const pendingRequestState = transactions .filter((action) => action.state === TransactionTypes.TransactionState.PENDING) @@ -677,8 +674,9 @@ export default class RequestLogic implements RequestLogicTypes.IRequestLogic { requestId: RequestLogicTypes.RequestId, action: RequestLogicTypes.IAction, ): Promise { - const { confirmedRequestState, pendingRequestState } = - await this.computeRequestFromRequestId(requestId); + const { confirmedRequestState, pendingRequestState } = await this.computeRequestFromRequestId( + requestId, + ); try { // Check if the action doesn't fail with the request state diff --git a/packages/request-logic/test/unit/utils/test-data-generator.ts b/packages/request-logic/test/unit/utils/test-data-generator.ts index c41f08b8ef..25a107eb20 100644 --- a/packages/request-logic/test/unit/utils/test-data-generator.ts +++ b/packages/request-logic/test/unit/utils/test-data-generator.ts @@ -283,7 +283,7 @@ export const fakeSignatureProvider: SignatureProviderTypes.ISignatureProvider = [payeeRaw.address as string]: sign(data, payeeRaw.signatureParams), [payerRaw.address as string]: sign(data, payerRaw.signatureParams), [otherIdRaw.address as string]: sign(data, otherIdRaw.signatureParams), - })[identity.value], + }[identity.value]), supportedIdentityTypes: [IdentityTypes.TYPE.ETHEREUM_ADDRESS], supportedMethods: [SignatureTypes.METHOD.ECDSA], }; diff --git a/packages/request-node/src/request/confirmedTransactionStore.ts b/packages/request-node/src/request/confirmedTransactionStore.ts index 85a9ac14d7..c5d54564f9 100644 --- a/packages/request-node/src/request/confirmedTransactionStore.ts +++ b/packages/request-node/src/request/confirmedTransactionStore.ts @@ -19,8 +19,9 @@ export default class ConfirmedTransactionStore { public async getConfirmedTransaction( transactionHash: string, ): Promise { - const { transactions, blockNumber } = - await this.subgraphClient.getTransactionsByDataHash(transactionHash); + const { transactions, blockNumber } = await this.subgraphClient.getTransactionsByDataHash( + transactionHash, + ); if (transactions.length === 0) { return; } diff --git a/packages/request-node/src/request/getChannelsByTopic.ts b/packages/request-node/src/request/getChannelsByTopic.ts index f471a50346..44dbb8c610 100644 --- a/packages/request-node/src/request/getChannelsByTopic.ts +++ b/packages/request-node/src/request/getChannelsByTopic.ts @@ -3,10 +3,7 @@ import { Request, Response } from 'express'; import { StatusCodes } from 'http-status-codes'; export default class GetChannelHandler { - constructor( - private logger: LogTypes.ILogger, - private dataAccess: DataAccessTypes.IDataRead, - ) { + constructor(private logger: LogTypes.ILogger, private dataAccess: DataAccessTypes.IDataRead) { this.handler = this.handler.bind(this); } diff --git a/packages/request-node/src/request/getConfirmedTransactionHandler.ts b/packages/request-node/src/request/getConfirmedTransactionHandler.ts index a6c65bb628..579672f10a 100644 --- a/packages/request-node/src/request/getConfirmedTransactionHandler.ts +++ b/packages/request-node/src/request/getConfirmedTransactionHandler.ts @@ -4,10 +4,7 @@ import { StatusCodes } from 'http-status-codes'; import ConfirmedTransactionStore from './confirmedTransactionStore'; export default class GetConfirmedTransactionHandler { - constructor( - private logger: LogTypes.ILogger, - private store: ConfirmedTransactionStore, - ) { + constructor(private logger: LogTypes.ILogger, private store: ConfirmedTransactionStore) { this.handler = this.handler.bind(this); } diff --git a/packages/request-node/src/request/getStatus.ts b/packages/request-node/src/request/getStatus.ts index 0b7184cc7d..788d6d06ef 100644 --- a/packages/request-node/src/request/getStatus.ts +++ b/packages/request-node/src/request/getStatus.ts @@ -14,10 +14,7 @@ const packageJson = require('../../package.json'); * @param dataAccess data access layer */ export default class GetStatusHandler { - constructor( - private logger: LogTypes.ILogger, - private dataAccess: DataAccessTypes.IDataAccess, - ) { + constructor(private logger: LogTypes.ILogger, private dataAccess: DataAccessTypes.IDataAccess) { this.handler = this.handler.bind(this); } async handler(clientRequest: Request, serverResponse: Response): Promise { diff --git a/packages/request-node/src/request/getTransactionsByChannelId.ts b/packages/request-node/src/request/getTransactionsByChannelId.ts index af50a3a09f..ec7c97cc55 100644 --- a/packages/request-node/src/request/getTransactionsByChannelId.ts +++ b/packages/request-node/src/request/getTransactionsByChannelId.ts @@ -3,10 +3,7 @@ import { Request, Response } from 'express'; import { StatusCodes } from 'http-status-codes'; export default class GetTransactionsByChannelIdHandler { - constructor( - private logger: LogTypes.ILogger, - private dataAccess: DataAccessTypes.IDataRead, - ) { + constructor(private logger: LogTypes.ILogger, private dataAccess: DataAccessTypes.IDataRead) { this.handler = this.handler.bind(this); } diff --git a/packages/request-node/src/request/ipfsAdd.ts b/packages/request-node/src/request/ipfsAdd.ts index 214afff822..22f6e2026b 100644 --- a/packages/request-node/src/request/ipfsAdd.ts +++ b/packages/request-node/src/request/ipfsAdd.ts @@ -13,10 +13,7 @@ import { getPersistTransactionTimeout } from '../config'; * @param dataAccess data access layer */ export default class IpfsAddHandler { - constructor( - private logger: LogTypes.ILogger, - private ipfsStorage: StorageTypes.IIpfsStorage, - ) { + constructor(private logger: LogTypes.ILogger, private ipfsStorage: StorageTypes.IIpfsStorage) { this.handler = this.handler.bind(this); } diff --git a/packages/request-node/src/request/persistTransaction.ts b/packages/request-node/src/request/persistTransaction.ts index 25305978ce..9b7b63bad1 100644 --- a/packages/request-node/src/request/persistTransaction.ts +++ b/packages/request-node/src/request/persistTransaction.ts @@ -12,10 +12,7 @@ export default class PersistTransactionHandler { /** * Persist transaction constructor */ - constructor( - private dataAccess: DataAccessTypes.IDataWrite, - private logger: LogTypes.ILogger, - ) { + constructor(private dataAccess: DataAccessTypes.IDataWrite, private logger: LogTypes.ILogger) { this.handler = this.handler.bind(this); } @@ -90,10 +87,10 @@ export default class PersistTransactionHandler { dataAccessResponse.on('error', async (e: unknown) => { this.logger.error(`persistTransaction error: ${e}\n transactionHash: ${transactionHash.value}, channelId: ${ - clientRequest.body.channelId - }, topics: ${clientRequest.body.topics}, transactionData: ${JSON.stringify( - clientRequest.body.transactionData, - )}`); + clientRequest.body.channelId + }, topics: ${clientRequest.body.topics}, transactionData: ${JSON.stringify( + clientRequest.body.transactionData, + )}`); }); this.logger.debug( diff --git a/packages/smart-contracts/src/contracts/SingleRequestProxyFactory.sol b/packages/smart-contracts/src/contracts/SingleRequestProxyFactory.sol index 55c99c035d..093aba755b 100644 --- a/packages/smart-contracts/src/contracts/SingleRequestProxyFactory.sol +++ b/packages/smart-contracts/src/contracts/SingleRequestProxyFactory.sol @@ -40,7 +40,11 @@ contract SingleRequestProxyFactory is Ownable { event ERC20FeeProxyUpdated(address indexed newERC20FeeProxy); event EthereumFeeProxyUpdated(address indexed newEthereumFeeProxy); - constructor(address _ethereumFeeProxy, address _erc20FeeProxy, address _owner) { + constructor( + address _ethereumFeeProxy, + address _erc20FeeProxy, + address _owner + ) { require(_ethereumFeeProxy != address(0), 'EthereumFeeProxy address cannot be zero'); require(_erc20FeeProxy != address(0), 'ERC20FeeProxy address cannot be zero'); require(_owner != address(0), 'Owner address cannot be zero'); diff --git a/packages/smart-contracts/src/contracts/test/UsdtFake.sol b/packages/smart-contracts/src/contracts/test/UsdtFake.sol index 8f53885094..f4302778f2 100644 --- a/packages/smart-contracts/src/contracts/test/UsdtFake.sol +++ b/packages/smart-contracts/src/contracts/test/UsdtFake.sol @@ -33,7 +33,11 @@ contract UsdtFake { } // Non-standard: no return value - function transferFrom(address sender, address recipient, uint256 amount) external { + function transferFrom( + address sender, + address recipient, + uint256 amount + ) external { _transfer(sender, recipient, amount); uint256 currentAllowance = _allowances[sender][msg.sender]; require(currentAllowance >= amount, 'ERC20: transfer amount exceeds allowance'); @@ -42,7 +46,11 @@ contract UsdtFake { } } - function _transfer(address sender, address recipient, uint256 amount) internal { + function _transfer( + address sender, + address recipient, + uint256 amount + ) internal { require(sender != address(0), 'ERC20: transfer from the zero address'); require(recipient != address(0), 'ERC20: transfer to the zero address'); uint256 senderBalance = _balances[sender]; @@ -53,7 +61,11 @@ contract UsdtFake { _balances[recipient] += amount; } - function _approve(address owner, address spender, uint256 amount) internal { + function _approve( + address owner, + address spender, + uint256 amount + ) internal { require(owner != address(0), 'ERC20: approve from the zero address'); require(spender != address(0), 'ERC20: approve to the zero address'); _allowances[owner][spender] = amount; diff --git a/packages/smart-contracts/src/lib/ContractArtifact.ts b/packages/smart-contracts/src/lib/ContractArtifact.ts index cf86e6ec7c..f64412dda7 100644 --- a/packages/smart-contracts/src/lib/ContractArtifact.ts +++ b/packages/smart-contracts/src/lib/ContractArtifact.ts @@ -34,10 +34,7 @@ export type DeploymentInformation = { * and utilities to connect to it **/ export class ContractArtifact { - constructor( - private info: ArtifactInfo, - private lastVersion: string, - ) { + constructor(private info: ArtifactInfo, private lastVersion: string) { this.connect = this.connect.bind(this); this.getInterface = this.getInterface.bind(this); this.getContractAbi = this.getContractAbi.bind(this); diff --git a/types-overrides/jest/index.d.ts b/types-overrides/jest/index.d.ts index 4c5ce606c4..95d3a657c1 100644 --- a/types-overrides/jest/index.d.ts +++ b/types-overrides/jest/index.d.ts @@ -551,23 +551,32 @@ declare namespace jest { interface Each { // Exclusively arrays. - ( - cases: ReadonlyArray, - ): (name: string, fn: (...args: T) => any, timeout?: number) => void; - >( - cases: ReadonlyArray, - ): (name: string, fn: (...args: ExtractEachCallbackArgs) => any, timeout?: number) => void; + (cases: ReadonlyArray): ( + name: string, + fn: (...args: T) => any, + timeout?: number, + ) => void; + >(cases: ReadonlyArray): ( + name: string, + fn: (...args: ExtractEachCallbackArgs) => any, + timeout?: number, + ) => void; // Not arrays. - ( - cases: ReadonlyArray, - ): (name: string, fn: (arg: T, done: DoneCallback) => any, timeout?: number) => void; - ( - cases: ReadonlyArray>, - ): (name: string, fn: (...args: any[]) => any, timeout?: number) => void; - ( - strings: TemplateStringsArray, - ...placeholders: any[] - ): (name: string, fn: (arg: any, done: DoneCallback) => any, timeout?: number) => void; + (cases: ReadonlyArray): ( + name: string, + fn: (arg: T, done: DoneCallback) => any, + timeout?: number, + ) => void; + (cases: ReadonlyArray>): ( + name: string, + fn: (...args: any[]) => any, + timeout?: number, + ) => void; + (strings: TemplateStringsArray, ...placeholders: any[]): ( + name: string, + fn: (arg: any, done: DoneCallback) => any, + timeout?: number, + ) => void; } /** diff --git a/yarn.lock b/yarn.lock index cece36876d..9754fbc0a8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -20154,10 +20154,10 @@ prettier-plugin-solidity@1.0.0-beta.19: solidity-comments-extractor "^0.0.7" string-width "^4.2.3" -prettier@3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.0.3.tgz#432a51f7ba422d1469096c0fdc28e235db8f9643" - integrity sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg== +prettier@2.8.8, prettier@^2.3.1: + version "2.8.8" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da" + integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q== prettier@^1.14.3: version "1.19.1" @@ -20169,11 +20169,6 @@ prettier@^2.1.2: resolved "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz" integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q== -prettier@^2.3.1: - version "2.8.8" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da" - integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q== - pretty-format@29.4.3: version "29.4.3" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.4.3.tgz#25500ada21a53c9e8423205cf0337056b201244c"