Skip to content

Commit

Permalink
Several TS and config improvements.
Browse files Browse the repository at this point in the history
  • Loading branch information
steven2308 committed Jan 26, 2024
1 parent a54256d commit 5c6dc47
Show file tree
Hide file tree
Showing 49 changed files with 4,433 additions and 2,553 deletions.
2 changes: 1 addition & 1 deletion .prettierrc.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"plugins": ["prettier-plugin-solidity"],
"semi": false,
"overrides": [
{
Expand All @@ -17,7 +18,6 @@
"trailingComma": "all",
"singleQuote": true,
"bracketSpacing": true,
"jsxBracketSameLine": true,
"parser": "typescript",
"printWidth": 100,
"tabWidth": 2,
Expand Down
22 changes: 0 additions & 22 deletions contracts/mocks/ERC1155Mock.sol

This file was deleted.

7 changes: 2 additions & 5 deletions contracts/mocks/OwnableMintableERC721Mock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,10 @@ pragma solidity ^0.8.21;
/// @dev This mock smart contract is intended to be used with `@defi-wonderland/smock` and doesn't need any business
/// logic.
contract OwnableMintableERC721Mock {

address private _mockOwner;
address private _mockOwnerOf;

constructor (
address mockOwner, address mockOwnerOf
) {

constructor(address mockOwner, address mockOwnerOf) {
_mockOwner = mockOwner;
_mockOwnerOf = mockOwnerOf;
}
Expand Down
5 changes: 1 addition & 4 deletions hardhat.config.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
import * as dotenv from 'dotenv';

import { HardhatUserConfig, task } from 'hardhat/config';
import 'dotenv/config';
import '@nomicfoundation/hardhat-ethers';
import '@nomicfoundation/hardhat-toolbox';
import 'hardhat-contract-sizer';
import '@primitivefi/hardhat-dodoc';

dotenv.config();

// This is a sample Hardhat task. To learn how to create your own go to
// https://hardhat.org/guides/create-task.html
task('accounts', 'Prints the list of accounts', async (taskArgs, hre) => {
Expand Down
39 changes: 19 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,36 +16,23 @@
"engines": {
"node": ">=18"
},
"dependencies": {},
"devDependencies": {
"@nomicfoundation/hardhat-chai-matchers": "^2.0.3",
"@nomicfoundation/hardhat-ethers": "^3.0.5",
"@nomicfoundation/hardhat-network-helpers": "^1.0.10",
"@nomicfoundation/hardhat-toolbox": "^4.0.0",
"@nomicfoundation/hardhat-verify": "^2.0.3",
"@openzeppelin/contracts": "^5.0.0",
"@openzeppelin/contracts": "^5.0.1",
"@primitivefi/hardhat-dodoc": "^0.2.3",
"@typechain/ethers-v6": "^0.5.1",
"@typechain/hardhat": "^9.1.0",
"@types/chai": "^4.3.11",
"@types/mocha": "^10.0.6",
"@types/node": "^20.10.8",
"chai": "^4.2.0",
"dotenv": "^16.3.1",
"ethers": "^6.9.2",
"hardhat": "^2.19.4",
"hardhat-contract-sizer": "^2.10.0",
"hardhat-gas-reporter": "^1.0.9",
"solidity-coverage": "^0.8.6-sha1.0",
"squirrelly": "^8.0.8",
"ts-node": "^11.0.0-beta.1",
"typechain": "^8.3.2",
"typescript": "^5.3.3",
"solc": "0.8.21",
"rimraf": "^5.0.5",
"walk-sync": "^3.0.0",
"@typescript-eslint/eslint-plugin": "^6.19.0",
"@typescript-eslint/parser": "^6.19.0",
"@types/node": "^20.11.7",
"@typescript-eslint/eslint-plugin": "^6.19.1",
"@typescript-eslint/parser": "^6.19.1",
"chai": "^4.4.1",
"dotenv": "^16.4.1",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint-config-standard": "^17.1.0",
Expand All @@ -54,7 +41,19 @@
"eslint-plugin-n": "^16.6.2",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-promise": "^6.1.1",
"ethers": "^6.10.0",
"hardhat": "^2.19.4",
"hardhat-contract-sizer": "^2.10.0",
"hardhat-gas-reporter": "^1.0.9",
"prettier": "^3.2.4",
"prettier-plugin-solidity": "^1.3.1"
"prettier-plugin-solidity": "^1.3.1",
"rimraf": "^5.0.5",
"solc": "0.8.21",
"solidity-coverage": "0.8.6-sha1.0",
"squirrelly": "^8.0.8",
"ts-node": "11.0.0-beta.1",
"typechain": "^8.3.2",
"typescript": "^5.3.3",
"walk-sync": "^3.0.0"
}
}
Loading

0 comments on commit 5c6dc47

Please sign in to comment.