Skip to content

Commit

Permalink
Add .ts files to prettier options
Browse files Browse the repository at this point in the history
  • Loading branch information
andreogle committed Aug 25, 2023
1 parent 181be65 commit 7dc2057
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 18 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
"generate:chains": "ts-node scripts/generate-chains.ts",
"lint": "yarn lint:eslint && yarn lint:prettier && yarn lint:tsc",
"lint:eslint": "eslint . --ext .js,.ts",
"lint:prettier": "prettier --check \"./**/*.{js,md,json}\"",
"lint:prettier": "prettier --check \"./**/*.{ts,js,md,json}\"",
"lint:tsc": "tsc --noEmit",
"prepare": "husky install",
"prepublishOnly": "yarn validate:chains",
"prettier": "prettier --write \"./**/*.{js,md,json}\"",
"prettier": "prettier --write \"./**/*.{ts,js,md,json}\"",
"providers:ping": "ts-node scripts/ping-providers.ts",
"providers:time": "ts-node scripts/calculate-average-block-times.ts",
"test": "node --test --loader ts-node/esm ./src/**/*.test.ts",
Expand Down
2 changes: 1 addition & 1 deletion scripts/calculate-average-block-times.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { CHAINS } from '../src';
const BLOCK_LOOKBACK = 400_000;

async function calculateAverageBlockTimes(): Promise<void> {
const specifiedChain = CHAINS.find(chain => chain.alias === process.env.CHAIN);
const specifiedChain = CHAINS.find((chain) => chain.alias === process.env.CHAIN);
const chains = specifiedChain ? [specifiedChain] : CHAINS;

const results = await Promise.allSettled(
Expand Down
1 change: 0 additions & 1 deletion scripts/generate-chains.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,3 @@ mergeJsonFiles()
console.log(error);
process.exit(1);
});

6 changes: 2 additions & 4 deletions scripts/ping-providers.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
import { JsonRpcProvider } from 'ethers';
import { CHAINS } from '../src';

const specifiedChain = CHAINS.find(chain => chain.alias === process.env.CHAIN);
const specifiedChain = CHAINS.find((chain) => chain.alias === process.env.CHAIN);
const chains = specifiedChain ? [specifiedChain] : CHAINS;

chains.forEach(async (chain) => {
const provider = new JsonRpcProvider(chain.providerUrl);
const chainId = (await provider.getNetwork()).chainId;
if (chainId.toString() !== chain.id) {
throw new Error(
`${chain.alias} provider reports chain ID to be ${chainId}, while it is defined to be ${chain.id}`
);
throw new Error(`${chain.alias} provider reports chain ID to be ${chainId}, while it is defined to be ${chain.id}`);
}
const blockTimestamp = (await provider.getBlock('latest'))!.timestamp;
const deltaTime = Math.floor(new Date().getTime() / 1000) - blockTimestamp;
Expand Down
3 changes: 1 addition & 2 deletions scripts/validate-chains.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ if (CHAINS.length !== jsonChains.length) {
jsonFiles.forEach((filePath: string, index: number) => {
const chain = jsonChains[index]!;
if (filePath.replace('.json', '') !== chain.alias) {
console.log('JSON file name must match the chain\'s alias');
console.log("JSON file name must match the chain's alias");
console.log(`Current value: ${filePath}.json. Expected: ${chain.alias}.json`);
process.exit(1);
}
Expand Down Expand Up @@ -54,4 +54,3 @@ jsonChains.forEach((chain: any, index: number) => {

console.log('Successfully validated chains!');
process.exit(0);

5 changes: 3 additions & 2 deletions src/hardhat-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ import { toUpperSnakeCase } from './utils/strings';
import { Chain, HardhatEtherscanConfig, HardhatNetworksConfig } from './types';

export function getEnvVariableNames(): string[] {
const apiKeyEnvNames = CHAINS.filter((chain) => chain.explorer?.api?.key?.required).map((chain) => etherscanApiKeyName(chain));
const apiKeyEnvNames = CHAINS.filter((chain) => chain.explorer?.api?.key?.required).map((chain) =>
etherscanApiKeyName(chain)
);

const networkRpcUrlNames = CHAINS.map((chain) => chain.providerUrl);

Expand Down Expand Up @@ -71,4 +73,3 @@ export function networks(): HardhatNetworksConfig {
return networks;
}, {} as HardhatNetworksConfig);
}

7 changes: 3 additions & 4 deletions src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,17 @@ export interface HardhatNetworksConfig {
accounts: { mnemonic: string };
chainId: number;
url: string;
}
};
}

// https://hardhat.org/hardhat-runner/plugins/nomicfoundation-hardhat-verify#adding-support-for-other-networks
export interface HardhatEtherscanCustomChain {
network: string;
chainId: number;
urls: { apiURL: string; browserURL: string; }
urls: { apiURL: string; browserURL: string };
}

export interface HardhatEtherscanConfig {
apiKey: { [alias: string]: string; }
apiKey: { [alias: string]: string };
customChains: HardhatEtherscanCustomChain[];
}

1 change: 0 additions & 1 deletion src/validations/deep-equal.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,3 @@ describe('deepEqual', () => {
assert.equal(deepEqual(func1, func2), false);
});
});

1 change: 0 additions & 1 deletion src/validations/deep-equal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,3 @@ export function deepEqual(obj1: any, obj2: any): boolean {

return true;
}

0 comments on commit 7dc2057

Please sign in to comment.