Merge pull request #59 from pnetwork-association/feat/add-husky

Add husky

.husky/pre-commit

@@ -0,0 +1 @@
+yarn lint

cpp/package.json

@@ -10,7 +10,9 @@
     "build": "make all",
     "clean": "make clean",
     "test": "yarn build && mocha",
-    "lint": "./lint scripts/*.sh"
+    "lint": "./lint scripts/*.sh && npx prettier --check test/",
+    "prettier:fix": "npx prettier --check --write test/",
+    "prettier": "npx prettier --cache --check --ignore-path ../.prettierignore --config ../.prettierrc ./src ./test"
   },
   "devDependencies": {
     "@eosnetwork/vert": "^1.0.0",

cpp/test/lockbox.test.js

@@ -44,8 +44,16 @@ describe('Lockbox testing', () => {
 
   before(async () => {
     blockchain.createAccounts(user, evil, issuer, bridge, recipient)
-    lockbox.contract = deploy(blockchain, lockbox.account, 'contracts/build/lockbox')
-    token.contract = deploy(blockchain, token.account, 'contracts/build/eosio.token')
+    lockbox.contract = deploy(
+      blockchain,
+      lockbox.account,
+      'contracts/build/lockbox',
+    )
+    token.contract = deploy(
+      blockchain,
+      token.account,
+      'contracts/build/eosio.token',
+    )
     xerc20.contract = deploy(
       blockchain,
       xerc20.account,

cpp/test/utils/get-event-bytes.js

@@ -5,4 +5,4 @@ module.exports.getEventBytes = _contract => {
   const match = re.exec(_contract.bc.console)
   const extract = R.compose(R.prop(1), R.split(':'), R.prop(0))
   return extract(match)
-}
+}

cpp/test/utils/precision-utils.js

@@ -4,11 +4,13 @@ const adjustPrecision = (amount, precision) => {
   }
 
   const [integerPart, decimalPart] = amount.split('.')
-  const trimmedDecimals = (decimalPart || '').slice(0, precision).padEnd(precision, '0')
+  const trimmedDecimals = (decimalPart || '')
+    .slice(0, precision)
+    .padEnd(precision, '0')
 
   return precision > 0 ? `${integerPart}.${trimmedDecimals}` : integerPart
 }
 
 module.exports = {
-  adjustPrecision
+  adjustPrecision,
 }

cpp/test/utils/wharfkit-ext.js

@@ -13,9 +13,8 @@ const assetOperation = R.curry((_fn, _op1, _op2) => {
 
   return Asset.from(
     _fn === R.sum ? _fn([op1.value, op2.value]) : _fn(op1.value)(op2.value),
-    op1.symbol
+    op1.symbol,
   )
-
 })
 
 const substract = assetOperation(R.subtract)

javascript/event-attestator/package.json

@@ -6,8 +6,11 @@
   "license": "MIT",
   "scripts": {
     "test": "jest",
-    "lint": "npx eslint .",
-    "lint:fix": "npx eslint --fix ."
+    "eslint": "npx eslint .",
+    "eslint:fix": "yarn eslint --fix",
+    "prettier:fix": "yarn prettier --write",
+    "lint": "yarn prettier",
+    "prettier": "npx prettier --cache --check --ignore-path ../../.prettierignore --config ../../.prettierrc ./src ./test"
   },
   "devDependencies": {
     "eslint": "^9.13.0",

package.json

@@ -15,7 +15,8 @@
     "test": "yarn workspaces foreach --all --parallel --no-private run test",
     "lint": "yarn workspaces foreach --all --parallel --no-private run lint",
     "build": "yarn workspaces foreach --all --parallel --no-private run build",
-    "prettier": "yarn workspaces foreach --all --parallel --no-private run prettier"
+    "prettier": "yarn workspaces foreach --all --parallel --no-private run prettier",
+    "prepare": "husky"
   },
   "devDependencies": {
     "@eslint/js": "^9.5.0",
@@ -29,5 +30,8 @@
     "typescript": "4.7.4",
     "typescript-eslint": "^7.13.1"
   },
-  "packageManager": "[email protected]"
+  "packageManager": "[email protected]",
+  "dependencies": {
+    "husky": "^9.1.6"
+  }
 }

solidity/package.json

@@ -16,8 +16,10 @@
     "test:forge": "forge test",
     "test:hh": "hardhat clean && FORK=1 hardhat test",
     "test:hh-no-fork": "hardhat test",
-    "lint": "npx solhint src/**/*.sol",
-    "prettier": "prettier --write ./src ./test",
+    "solhint": "npx solhint src/**/*.sol",
+    "prettier": "npx prettier --cache --check --ignore-path ../.prettierignore --config ../.prettierrc ./src ./test",
+    "lint": "yarn solhint && yarn prettier",
+    "prettier:fix": "yarn prettier --write",
     "coverage": "./coverage.sh"
   },
   "devDependencies": {

solidity/src/interfaces/IAdapter.sol

@@ -22,7 +22,7 @@ interface IAdapter {
     event Settled(bytes32 indexed eventId);
     event FeesManagerChanged(address newAddress);
     // Low level event
-    // Swap(bytes) 
+    // Swap(bytes)
     // topic: 0x66756E6473206172652073616675207361667520736166752073616675202E2E
 
     error NotAContract(address addr);
@@ -90,4 +90,4 @@ interface IAdapter {
      * @param amount The amount from which the fees will be calculated
      */
     function calculateFee(uint256 amount) external returns (uint256);
-}
+}

solidity/test/hardhat/utils/get-swap-event.js

@@ -1,6 +1,7 @@
 const R = require('ramda')
 
-const SWAP_TOPIC = '0x66756e6473206172652073616675207361667520736166752073616675202e2e'
+const SWAP_TOPIC =
+  '0x66756e6473206172652073616675207361667520736166752073616675202e2e'
 
 const getSwapEvent = _tx =>
   _tx
@@ -11,4 +12,4 @@ const getSwapEvent = _tx =>
 module.exports = {
   SWAP_TOPIC,
   getSwapEvent,
-}
+}

solidity/test/hardhat/utils/validate-upgrade.js

@@ -1,8 +1,10 @@
 const R = require('ramda')
 
 module.exports.validateUpgrade = R.curry((_hre, _contractName, _proxy) =>
-  _hre.ethers.getContractFactory(_contractName)
-    .then(_contractFactory => _hre.upgrades.validateUpgrade(_proxy, _contractFactory))
-    .catch(_err => Promise.reject(_err))
-
+  _hre.ethers
+    .getContractFactory(_contractName)
+    .then(_contractFactory =>
+      _hre.upgrades.validateUpgrade(_proxy, _contractFactory),
+    )
+    .catch(_err => Promise.reject(_err)),
 )

yarn.lock

@@ -5916,6 +5916,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"husky@npm:^9.1.6":
+  version: 9.1.6
+  resolution: "husky@npm:9.1.6"
+  bin:
+    husky: bin.js
+  checksum: 10c0/705673db4a247c1febd9c5df5f6a3519106cf0335845027bb50a15fba9b1f542cb2610932ede96fd08008f6d9f49db0f15560509861808b0031cdc0e7c798bac
+  languageName: node
+  linkType: hard
+
 "iconv-lite@npm:0.4.24":
   version: 0.4.24
   resolution: "iconv-lite@npm:0.4.24"
@@ -8000,6 +8009,7 @@ __metadata:
     "@types/eslint__js": "npm:^8.42.3"
     eslint: "npm:8.57.0"
     eslint-config-prettier: "npm:^9.1.0"
+    husky: "npm:^9.1.6"
     prettier: "npm:3.3.2"
     prettier-plugin-solidity: "npm:^1.3.1"
     solhint: "npm:^5.0.1"