Skip to content
Merged
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
4 changes: 1 addition & 3 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,5 @@ INFURA_KEY=INFURA PROJECT ID

# Additional keys
ETHERSCAN_KEY=ETHERSCAN API KEY
BSCSCAN_KEY=BSCSCAN API KEY
POLYGONSCAN_KEY=POLYGONSCAN API KEY
AVALANCHE_KEY=AVALANCHE API KEY

COINMARKETCAP_KEY=COINMARKETCAP API KEY
4 changes: 2 additions & 2 deletions .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ runs:
using: composite
steps:
- name: Setup node
uses: actions/setup-node@v4
uses: actions/setup-node@v5
with:
node-version: "20.x"
node-version: "22.x"
cache: npm

- name: Install packages
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout the repository
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Setup
uses: ./.github/actions/setup
Expand Down
10 changes: 8 additions & 2 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"plugins": ["prettier-plugin-solidity"],
"overrides": [
{
"files": "*.sol",
"options": {
"plugins": ["prettier-plugin-solidity"],
"printWidth": 99,
"tabWidth": 4,
"useTabs": false,
Expand All @@ -19,14 +19,20 @@
"tabWidth": 2,
"singleQuote": false,
"importOrder": [
"(^chai$)|(hardhat$)",
"ethers$",
"^@nomicfoundation/(.*)$",
"^@solarity/(.*)$",
"^@typechain/(.*)$",
"^@typechain/hardhat$",
"^hardhat-[a-zA-Z0-9_\\-]+$",
"^tsconfig-paths/register$",
"^solidity-[a-zA-Z0-9_\\-]+$",
"^hardhat/config$",
"^dotenv$",
"@scripts",
"@test-helpers",
"@(?:/generated-types|ethers-v6)",
"",
"^[a-zA-Z0-9_\\-]+$",
"^\\u0000",
"^\\.\\./",
Expand Down
16 changes: 0 additions & 16 deletions .solhint.json

This file was deleted.

2 changes: 0 additions & 2 deletions .solhintignore

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ npm run generate-types

### Other niceties

- The template comes with presetup `prettier`, `solhint` and `eslint` that lint the project via `husky` before compilation hook.
- The template comes with presetup `prettier`, `slippy` and `eslint` that lint the project via `husky` before compilation hook.
- The `.env.example` file is provided to check what is required as ENVs
- Preinstalled `@openzeppelin/contracts` and `@solarity/solidity-lib`

Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions deploy/1_token.migration.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ERC20Mock__factory } from "@ethers-v6";

import { Deployer, Reporter } from "@solarity/hardhat-migrate";

import { ERC20Mock__factory } from "@ethers-v6";

export = async (deployer: Deployer) => {
const erc20 = await deployer.deploy(ERC20Mock__factory, ["Mock", "Mock", 18]);

Expand Down
48 changes: 48 additions & 0 deletions eslint.config.cts
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
import globals from "globals";

import js from "@eslint/js";

import { defineConfig } from "eslint/config";

import tseslint from "typescript-eslint";

export default defineConfig(
{
ignores: [
"dist/**",
"node_modules/**",
"generated-types/**",
"artifacts/**",
"coverage/**",
".solcover.ts",
],
},
js.configs.recommended,
...tseslint.configs.recommended,
{
files: ["**/*.ts"],
languageOptions: {
parser: tseslint.parser,
parserOptions: {
project: "./tsconfig.json",
tsconfigRootDir: process.cwd(),
},
globals: {
...globals.node,
},
},
plugins: {
"@typescript-eslint": tseslint.plugin,
},
rules: {
"@typescript-eslint/ban-ts-comment": "off",
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-unused-expressions": "off",
"@typescript-eslint/no-floating-promises": "error",
"@typescript-eslint/no-misused-promises": [
"error",
{ checksVoidReturn: { attributes: false } },
],
},
},
);
48 changes: 0 additions & 48 deletions eslint.config.mjs

This file was deleted.

39 changes: 4 additions & 35 deletions hardhat.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import "@nomicfoundation/hardhat-chai-matchers";
import "@typechain/hardhat";

import "@nomicfoundation/hardhat-ethers";

import "@nomicfoundation/hardhat-chai-matchers";
import "@nomicfoundation/hardhat-verify";

import "@solarity/chai-zkit";
Expand All @@ -8,8 +11,6 @@ import "@solarity/hardhat-markup";
import "@solarity/hardhat-migrate";
import "@solarity/hardhat-zkit";

import "@typechain/hardhat";

import "hardhat-contract-sizer";
import "hardhat-gas-reporter";

Expand Down Expand Up @@ -41,38 +42,11 @@ const config: HardhatUserConfig = {
accounts: privateKey(),
gasMultiplier: 1.2,
},
chapel: {
url: "https://data-seed-prebsc-1-s1.binance.org:8545",
accounts: privateKey(),
gasMultiplier: 1.2,
timeout: 60000,
},
fuji: {
url: `https://avalanche-fuji.infura.io/v3/${process.env.INFURA_KEY}`,
accounts: privateKey(),
gasMultiplier: 1.2,
},
bsc: {
url: "https://bsc-dataseed.binance.org/",
accounts: privateKey(),
gasMultiplier: 1.2,
},
ethereum: {
url: `https://mainnet.infura.io/v3/${process.env.INFURA_KEY}`,
accounts: privateKey(),
gasMultiplier: 1.2,
},
polygon: {
url: `https://matic-mainnet.chainstacklabs.com`,
accounts: privateKey(),
gasMultiplier: 1.2,
},
avalanche: {
url: `https://api.avax.network/ext/bc/C/rpc`,
accounts: privateKey(),
gasMultiplier: 1.2,
timeout: 60000,
},
},
solidity: {
version: "0.8.28",
Expand All @@ -93,11 +67,6 @@ const config: HardhatUserConfig = {
apiKey: {
sepolia: `${process.env.ETHERSCAN_KEY}`,
mainnet: `${process.env.ETHERSCAN_KEY}`,
bscTestnet: `${process.env.BSCSCAN_KEY}`,
bsc: `${process.env.BSCSCAN_KEY}`,
polygon: `${process.env.POLYGONSCAN_KEY}`,
avalancheFujiTestnet: `${process.env.AVALANCHE_KEY}`,
avalanche: `${process.env.AVALANCHE_KEY}`,
},
},
migrate: {
Expand Down
Loading