Skip to content

Commit fce8f74

Browse files
tmigonetmigone
authored
chore: update token-distribution to use our linting packages (#954)
 Signed-off-by: Tomás Migone <[email protected]>
1 parent 0d46406 commit fce8f74

21 files changed

+200
-617
lines changed

‎packages/eslint-graph-config/index.ts

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ export default [
4444
ignoreCase: true,
4545
allowSeparatedGroups: true,
4646
}],
47+
'@stylistic/brace-style': ['error', '1tbs'],
4748
},
4849
},
4950
]

‎packages/token-distribution/.eslintignore

-5
This file was deleted.

‎packages/token-distribution/.eslintrc

-15
This file was deleted.

‎packages/token-distribution/.prettierignore

Whitespace-only changes.

‎packages/token-distribution/.prettierrc.json

-35
This file was deleted.

‎packages/token-distribution/.solhint.json

-14
This file was deleted.

‎packages/token-distribution/.solhintignore

-1
This file was deleted.

‎packages/token-distribution/contracts/L2GraphTokenLockManager.sol

+4-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,10 @@ contract L2GraphTokenLockManager is GraphTokenLockManager, ICallhookReceiver {
136136
* @return Hash of the initialization calldata
137137
* @return Address of the created contract
138138
*/
139-
function _deployFromL1(bytes32 _salt, TransferredWalletData memory _walletData) internal returns (bytes32, address) {
139+
function _deployFromL1(
140+
bytes32 _salt,
141+
TransferredWalletData memory _walletData
142+
) internal returns (bytes32, address) {
140143
bytes memory initializer = _encodeInitializer(_walletData);
141144
address contractAddress = _deployProxy2(_salt, masterCopy, initializer);
142145
return (keccak256(initializer), contractAddress);

‎packages/token-distribution/contracts/MinimalProxyFactory.sol

+1-5
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,14 @@ contract MinimalProxyFactory {
1414
/// @dev Emitted when a new proxy is created
1515
event ProxyCreated(address indexed proxy);
1616

17-
1817
/**
1918
* @notice Gets the deterministic CREATE2 address for MinimalProxy with a particular implementation
2019
* @dev Uses address(this) as deployer to compute the address. Only for backwards compatibility.
2120
* @param _salt Bytes32 salt to use for CREATE2
2221
* @param _implementation Address of the proxy target implementation
2322
* @return Address of the counterfactual MinimalProxy
2423
*/
25-
function getDeploymentAddress(
26-
bytes32 _salt,
27-
address _implementation
28-
) public view returns (address) {
24+
function getDeploymentAddress(bytes32 _salt, address _implementation) public view returns (address) {
2925
return getDeploymentAddress(_salt, _implementation, address(this));
3026
}
3127

‎packages/token-distribution/eslint.config.js

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
const config = require('eslint-graph-config')
2+
3+
module.exports = [
4+
...config.default,
5+
{
6+
rules: {
7+
'@typescript-eslint/no-unsafe-assignment': 'off',
8+
'@typescript-eslint/no-var-requires': 'off',
9+
'@typescript-eslint/no-unsafe-call': 'off',
10+
'@typescript-eslint/no-unsafe-member-access': 'off',
11+
'@typescript-eslint/no-unsafe-argument': 'off',
12+
},
13+
},
14+
]

‎packages/token-distribution/package.json

+9-23
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,8 @@
1313
"test:gas": "RUN_EVM=true REPORT_GAS=true scripts/test",
1414
"test:coverage": "scripts/coverage",
1515
"lint": "yarn run lint:ts && yarn run lint:sol",
16-
"lint:fix": "yarn run lint:ts:fix && yarn run lint:sol:fix",
17-
"lint:ts": "eslint '*/**/*.{js,ts}'",
18-
"lint:ts:fix": "eslint '*/**/*.{js,ts}' --fix",
19-
"lint:sol": "solhint './contracts/**/*.sol'",
20-
"lint:sol:fix": "yarn prettier:sol && solhint --fix './contracts/**/*.sol'",
21-
"prettier": "yarn run prettier:ts && yarn run prettier:sol",
22-
"prettier:ts": "prettier --write 'test/**/*.ts'",
23-
"prettier:sol": "prettier --write 'contracts/**/*.sol'",
16+
"lint:ts": "eslint 'test/**/*.{js,ts}' --fix",
17+
"lint:sol": "prettier --write contracts/**/*.sol && solhint --fix contracts/**/*.sol --config node_modules/solhint-graph-config/index.js",
2418
"security": "scripts/security",
2519
"flatten": "scripts/flatten",
2620
"typechain": "hardhat typechain",
@@ -48,21 +42,12 @@
4842
"@typechain/hardhat": "^2.0.0",
4943
"@types/mocha": "^9.1.0",
5044
"@types/node": "^20.4.2",
51-
"@typescript-eslint/eslint-plugin": "^5.20.0",
52-
"@typescript-eslint/parser": "^5.20.0",
5345
"chai": "^4.2.0",
5446
"coingecko-api": "^1.0.10",
5547
"consola": "^2.15.0",
5648
"dotenv": "^16.0.0",
57-
"eslint": "^8.13.0",
58-
"eslint-config-prettier": "^8.5.0",
59-
"eslint-config-standard": "^16.0.3",
60-
"eslint-plugin-import": "^2.22.0",
61-
"eslint-plugin-mocha-no-only": "^1.1.1",
62-
"eslint-plugin-node": "^11.1.0",
63-
"eslint-plugin-prettier": "^4.0.0",
64-
"eslint-plugin-promise": "^6.0.0",
65-
"eslint-plugin-standard": "5.0.0",
49+
"eslint": "^8.56.0",
50+
"eslint-graph-config": "workspace:^",
6651
"ethereum-waffle": "^3.1.1",
6752
"ethers": "^5.0.18",
6853
"graphql": "^16.5.0",
@@ -73,10 +58,11 @@
7358
"hardhat-gas-reporter": "^1.0.1",
7459
"inquirer": "8.0.0",
7560
"p-queue": "^6.6.2",
76-
"prettier": "^2.1.1",
77-
"prettier-plugin-solidity": "^1.0.0-alpha.56",
78-
"solhint": "^3.3.7",
79-
"solhint-plugin-prettier": "^0.0.5",
61+
"prettier": "^3.2.5",
62+
"prettier-plugin-solidity": "^1.3.1",
63+
"solhint-community": "^3.7.0",
64+
"solhint-graph-config": "workspace:^0.0.1",
65+
"solhint-plugin-prettier": "^0.1.0",
8066
"ts-node": "^10.9.1",
8167
"typechain": "^5.0.0",
8268
"typescript": "^4.0.2"

‎packages/token-distribution/prettier.config.js

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
const prettierGraphConfig = require('solhint-graph-config/prettier')
2+
module.exports = prettierGraphConfig

‎packages/token-distribution/test/distributor.test.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
import { expect } from 'chai'
2-
import { deployments } from 'hardhat'
31
import 'hardhat-deploy'
4-
5-
import { GraphTokenMock } from '../build/typechain/contracts/GraphTokenMock'
2+
import { deployments } from 'hardhat'
3+
import { expect } from 'chai'
64
import { GraphTokenDistributor } from '../build/typechain/contracts/GraphTokenDistributor'
5+
import { GraphTokenMock } from '../build/typechain/contracts/GraphTokenMock'
76

8-
import { getContract, getAccounts, toGRT, Account } from './network'
7+
import { Account, getAccounts, getContract, toGRT } from './network'
8+
import { DeployOptions } from 'hardhat-deploy/types'
99

1010
// Fixture
1111
const setupTest = deployments.createFixture(async ({ deployments }) => {
12-
const { deploy } = deployments
12+
const deploy = (name: string, options: DeployOptions) => deployments.deploy(name, options)
1313
const [deployer] = await getAccounts()
1414

1515
// Start from a fresh snapshot
@@ -44,11 +44,11 @@ describe('GraphTokenDistributor', () => {
4444
let distributor: GraphTokenDistributor
4545

4646
before(async function () {
47-
;[deployer, beneficiary1, beneficiary2] = await getAccounts()
47+
[deployer, beneficiary1, beneficiary2] = await getAccounts()
4848
})
4949

5050
beforeEach(async () => {
51-
;({ grt, distributor } = await setupTest())
51+
({ grt, distributor } = await setupTest())
5252
})
5353

5454
describe('init', function () {

‎packages/token-distribution/test/l1TokenLockTransferTool.test.ts

+13-12
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
11
import { BigNumber, constants, Signer } from 'ethers'
2-
import { expect } from 'chai'
32
import { deployments, ethers, upgrades } from 'hardhat'
3+
import { expect } from 'chai'
44

55
import '@nomiclabs/hardhat-ethers'
66
import 'hardhat-deploy'
77

8-
import { GraphTokenMock } from '../build/typechain/contracts/GraphTokenMock'
9-
import { GraphTokenLockWallet } from '../build/typechain/contracts/GraphTokenLockWallet'
108
import { GraphTokenLockManager } from '../build/typechain/contracts/GraphTokenLockManager'
11-
import { StakingMock } from '../build/typechain/contracts/StakingMock'
12-
import { L1TokenGatewayMock } from '../build/typechain/contracts/L1TokenGatewayMock'
9+
import { GraphTokenLockWallet } from '../build/typechain/contracts/GraphTokenLockWallet'
10+
import { GraphTokenMock } from '../build/typechain/contracts/GraphTokenMock'
1311
import { L1GraphTokenLockTransferTool } from '../build/typechain/contracts/L1GraphTokenLockTransferTool'
12+
import { L1TokenGatewayMock } from '../build/typechain/contracts/L1TokenGatewayMock'
13+
import { StakingMock } from '../build/typechain/contracts/StakingMock'
1414

1515
import { L1GraphTokenLockTransferTool__factory } from '../build/typechain/contracts/factories/L1GraphTokenLockTransferTool__factory'
1616
import { Staking__factory } from '@graphprotocol/contracts/dist/types/factories/Staking__factory'
1717

18-
import { defaultInitArgs, Revocability, TokenLockParameters } from './config'
19-
import { getAccounts, getContract, toGRT, Account, toBN } from './network'
18+
import { Account, getAccounts, getContract, toBN, toGRT } from './network'
2019
import { defaultAbiCoder, hexValue, keccak256, parseEther } from 'ethers/lib/utils'
20+
import { defaultInitArgs, Revocability, TokenLockParameters } from './config'
2121
import { advanceTimeAndBlock } from './network'
22+
import { DeployOptions } from 'hardhat-deploy/types'
2223

2324
const { AddressZero } = constants
2425

@@ -29,7 +30,7 @@ async function impersonateAccount(address: string): Promise<Signer> {
2930

3031
// Fixture
3132
const setupTest = deployments.createFixture(async ({ deployments }) => {
32-
const { deploy } = deployments
33+
const deploy = (name: string, options: DeployOptions) => deployments.deploy(name, options)
3334
const [deployer, , , , l2LockImplementationMock] = await getAccounts()
3435

3536
// Start from a fresh snapshot
@@ -79,7 +80,7 @@ const setupTest = deployments.createFixture(async ({ deployments }) => {
7980
// tokenLock: tokenLockWallet as GraphTokenLockWallet,
8081
tokenLockManager: tokenLockManager as GraphTokenLockManager,
8182
gateway: gateway as L1TokenGatewayMock,
82-
transferTool: transferTool as L1GraphTokenLockTransferTool,
83+
transferTool: transferTool,
8384
}
8485
})
8586

@@ -143,12 +144,12 @@ describe('L1GraphTokenLockTransferTool', () => {
143144
}
144145

145146
before(async function () {
146-
;[deployer, beneficiary, hacker, l2ManagerMock, l2LockImplementationMock, l2Owner, l2Beneficiary] =
147-
await getAccounts()
147+
[deployer, beneficiary, hacker, l2ManagerMock, l2LockImplementationMock, l2Owner, l2Beneficiary]
148+
= await getAccounts()
148149
})
149150

150151
beforeEach(async () => {
151-
;({ grt, tokenLockManager, staking, gateway, transferTool } = await setupTest())
152+
({ grt, tokenLockManager, staking, gateway, transferTool } = await setupTest())
152153

153154
// Setup authorized functions in Manager
154155
await authProtocolFunctions(tokenLockManager, staking.address, transferTool.address)

‎packages/token-distribution/test/l2TokenLockManager.test.ts

+10-9
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
11
import { constants, Wallet } from 'ethers'
2-
import { expect } from 'chai'
32
import { deployments, ethers } from 'hardhat'
3+
import { expect } from 'chai'
44

55
import '@nomiclabs/hardhat-ethers'
66
import 'hardhat-deploy'
77

88
import { GraphTokenMock } from '../build/typechain/contracts/GraphTokenMock'
9-
import { L2GraphTokenLockWallet } from '../build/typechain/contracts/L2GraphTokenLockWallet'
109
import { L2GraphTokenLockManager } from '../build/typechain/contracts/L2GraphTokenLockManager'
11-
import { StakingMock } from '../build/typechain/contracts/StakingMock'
10+
import { L2GraphTokenLockWallet } from '../build/typechain/contracts/L2GraphTokenLockWallet'
1211
import { Staking__factory } from '@graphprotocol/contracts/dist/types/factories/Staking__factory'
12+
import { StakingMock } from '../build/typechain/contracts/StakingMock'
1313

14-
import { defaultInitArgs, Revocability, TokenLockParameters } from './config'
15-
import { advanceTimeAndBlock, getAccounts, getContract, toGRT, Account } from './network'
14+
import { Account, advanceTimeAndBlock, getAccounts, getContract, toGRT } from './network'
1615
import { defaultAbiCoder, keccak256 } from 'ethers/lib/utils'
16+
import { defaultInitArgs, Revocability, TokenLockParameters } from './config'
17+
import { DeployOptions } from 'hardhat-deploy/types'
1718
import { Staking } from '@graphprotocol/contracts'
1819

1920
const { AddressZero } = constants
2021

2122
// Fixture
2223
const setupTest = deployments.createFixture(async ({ deployments }) => {
23-
const { deploy } = deployments
24+
const deploy = (name: string, options: DeployOptions) => deployments.deploy(name, options)
2425
const [deployer, , l1TransferToolMock, gateway] = await getAccounts()
2526

2627
// Start from a fresh snapshot
@@ -101,11 +102,11 @@ describe('L2GraphTokenLockManager', () => {
101102
}
102103

103104
before(async function () {
104-
;[deployer, beneficiary, l1TransferToolMock, gateway, l1TokenLock] = await getAccounts()
105+
[deployer, beneficiary, l1TransferToolMock, gateway, l1TokenLock] = await getAccounts()
105106
})
106107

107108
beforeEach(async () => {
108-
;({ grt, tokenLockManager, staking, tokenLockImplementation } = await setupTest())
109+
({ grt, tokenLockManager, staking, tokenLockImplementation } = await setupTest())
109110

110111
// Setup authorized functions in Manager
111112
await authProtocolFunctions(tokenLockManager, staking.address)
@@ -116,7 +117,7 @@ describe('L2GraphTokenLockManager', () => {
116117

117118
describe('TokenLockManager standard behavior', function () {
118119
it('reverts if initialized with empty token', async function () {
119-
const { deploy } = deployments
120+
const deploy = (name: string, options: DeployOptions) => deployments.deploy(name, options)
120121

121122
const d = deploy('L2GraphTokenLockManager', {
122123
from: deployer.address,

0 commit comments

Comments
 (0)