Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Map TransactionInfo according to Transfer['type'] #1477

Merged
merged 1 commit into from
Apr 29, 2024
Merged

Map TransactionInfo according to Transfer['type'] #1477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 0 additions & 43 deletions src/domain/safe/entities/transfer.entity.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,51 +14,8 @@ export const TransferSchema = z.discriminatedUnion('type', [

export const TransferPageSchema = buildPageSchema(TransferSchema);

const hasTokenAddress = (
transfer: Transfer,
): transfer is Transfer & {
tokenAddress: (ERC20Transfer | ERC721Transfer)['tokenAddress'];
} => {
return 'tokenAddress' in transfer && transfer.tokenAddress != null;
};

const hasValue = (
transfer: Transfer,
): transfer is Transfer & {
value: (ERC20Transfer | NativeTokenTransfer)['value'];
} => {
return 'value' in transfer && transfer.value != null;
};

const hasTokenId = (
transfer: Transfer,
): transfer is Transfer & {
tokenId: ERC721Transfer['tokenId'];
} => {
return 'tokenId' in transfer && transfer.tokenId != null;
};

export type ERC20Transfer = z.infer<typeof Erc20TransferSchema>;

// TODO: Just check `type` is `"ERC20_TRANSFER"`
export function isERC20Transfer(transfer: Transfer): transfer is ERC20Transfer {
return hasTokenAddress(transfer) && hasValue(transfer);
}
Comment on lines -44 to -46
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed the helpers as they are only used in one file.


export type ERC721Transfer = z.infer<typeof Erc721TransferSchema>;

// TODO: Just check `type` is `"ERC721_TRANSFER"`
export function isERC721Transfer(
transfer: Transfer,
): transfer is ERC721Transfer {
return hasTokenAddress(transfer) && hasTokenId(transfer);
}

export type NativeTokenTransfer = z.infer<typeof NativeTokenTransferSchema>;

// TODO: Just check `type` is `"ETHER_TRANSFER"`
export function isNativeTokenTransfer(
transfer: Transfer,
): transfer is NativeTokenTransfer {
return !hasTokenAddress(transfer) && hasValue(transfer);
}
13 changes: 4 additions & 9 deletions src/routes/transactions/mappers/transfers/transfer-info.mapper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
import { Inject, Injectable } from '@nestjs/common';
import { Safe } from '@/domain/safe/entities/safe.entity';
import {
isERC20Transfer,
isERC721Transfer,
isNativeTokenTransfer,
Transfer as DomainTransfer,
} from '@/domain/safe/entities/transfer.entity';
import { Transfer as DomainTransfer } from '@/domain/safe/entities/transfer.entity';
import { Token } from '@/domain/tokens/entities/token.entity';
import { TokenRepository } from '@/domain/tokens/token.repository';
import { ITokenRepository } from '@/domain/tokens/token.repository.interface';
Expand Down Expand Up @@ -56,7 +51,7 @@ export class TransferInfoMapper {
chainId: string,
domainTransfer: DomainTransfer,
): Promise<Transfer> {
if (isERC20Transfer(domainTransfer)) {
if (domainTransfer.type === 'ERC20_TRANSFER') {
const { tokenAddress, value } = domainTransfer;
const token: Token | null = await this.getToken(
chainId,
Expand All @@ -71,7 +66,7 @@ export class TransferInfoMapper {
token?.decimals,
token?.trusted,
);
} else if (isERC721Transfer(domainTransfer)) {
} else if (domainTransfer.type === 'ERC721_TRANSFER') {
const { tokenAddress, tokenId } = domainTransfer;
const token = await this.getToken(chainId, tokenAddress).catch(
() => null,
Expand All @@ -84,7 +79,7 @@ export class TransferInfoMapper {
token?.logoUri,
token?.trusted,
);
} else if (isNativeTokenTransfer(domainTransfer)) {
} else if (domainTransfer.type === 'ETHER_TRANSFER') {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes passe our tests and I also tested them against live data.

return new NativeCoinTransfer(domainTransfer.value);
} else {
throw Error('Unknown transfer type');
Expand Down