Skip to content
Open
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
3 changes: 2 additions & 1 deletion lib/repositories/contracts/contracts.repository.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,12 @@ import {
BytecodeMismatchError,
UnexpectedVerificationError,
} from '../../errors';
import { getNetworkFromResponse } from '../response';

function mapContractResponseToContractModel(contractResponse: ContractResponse): TenderlyContract {
const retVal: TenderlyContract = {
address: contractResponse.contract.address,
network: Number.parseInt(contractResponse.contract.network_id) as unknown as Network,
network: getNetworkFromResponse(contractResponse.contract.network_id),
};

if (contractResponse.display_name) {
Expand Down
15 changes: 15 additions & 0 deletions lib/repositories/response.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { Network } from '../types';
import { InvalidResponseError } from '../errors';

export function getNetworkFromResponse(networkId: string): Network {
if (!/^\d+$/.test(networkId)) {
throw new InvalidResponseError('Invalid network_id in Tenderly response');
}

const network = Number.parseInt(networkId, 10);
if (!Number.isSafeInteger(network)) {
throw new InvalidResponseError('Invalid network_id in Tenderly response');
}

return network as unknown as Network;
}
3 changes: 2 additions & 1 deletion lib/repositories/wallets/wallets.repository.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@ import {
import { handleError, InvalidResponseError, NotFoundError } from '../../errors';
import { GetByParams } from '../contracts/contracts.types';
import { ApiClientProvider } from '../../core/ApiClientProvider';
import { getNetworkFromResponse } from '../response';

function getContractFromResponse(contractResponse: WalletResponse): Wallet {
const walletDetails = contractResponse.account || contractResponse.contract;

return {
address: walletDetails.address,
network: Number.parseInt(walletDetails.network_id) as unknown as Network,
network: getNetworkFromResponse(walletDetails.network_id),
};
}

Expand Down
15 changes: 15 additions & 0 deletions test/network-id.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { getNetworkFromResponse } from '../lib/repositories/response';

const message = 'Invalid network_id in Tenderly response';

describe('getNetworkFromResponse', () => {
test('returns a valid numeric network id', () => {
expect(getNetworkFromResponse('1')).toBe(1);
});

test('rejects malformed network ids', () => {
expect(() => getNetworkFromResponse('1abc')).toThrow(message);
expect(() => getNetworkFromResponse('abc')).toThrow(message);
expect(() => getNetworkFromResponse('')).toThrow(message);
});
});
Loading