Merge branch 'main' into feat/account-imports

.gitignore

@@ -3,15 +3,19 @@ node_modules
 .secret
 coverage
 coverage.json
-typechain
 out/
 cache/
+types/
+dist/
 forge-cache/
 typechain-types
+typechain
+typings
 
 #Hardhat files
 cache
 artifacts
+artifacts-filtered
 account-abstraction
 scw-contracts
 

.npmignore

@@ -1,8 +1,12 @@
 hardhat.config.ts
 scripts
 test
+out
 artifacts
+artifacts-filtered
 typechain
+typechain-types
+typings
 cache
 coverage
 .env
@@ -12,9 +16,15 @@ coverage
 .eslint*
 .prettierrc
 .prettierignore
+.github/
 walletUtils.*
 coverage.json
 arguments.js
 typings/
 account-abstraction
-scw-contracts
+scw-contracts
+DerivedPriceFeedFlat.sol
+lib/forge-std/
+.husky/pre-commit
+.gitmodules
+.gas-snapshot

index.ts

@@ -0,0 +1 @@
+export * from './types'

package.json

@@ -12,8 +12,10 @@
     "test:bundler": "./scripts/bundler-tests.sh",
     "lint": "prettier --write 'contracts/**/*.sol'",
     "postinstall": "husky install",
-    "prepack": "pinst --disable",
-    "postpack": "pinst --enable"
+    "prepack": "pinst --disable && ./scripts/prepack-contracts.sh",
+    "postpack": "pinst --enable && ./scripts/postpack-contracts.sh",
+    "coverage": "COVERAGE=1 DISABLE_VIA_IR=true hardhat coverage",
+    "prepare": "husky install"
   },
   "repository": {
     "type": "git",
@@ -32,25 +34,46 @@
   "homepage": "https://github.com/bcnmy/biconomy-paymasters#readme",
   "devDependencies": {
     "@chainlink/contracts": "^0.6.0",
+    "@nomicfoundation/hardhat-foundry": "^1.0.0",
+    "@nomiclabs/hardhat-ethers": "^2.2.3",
+    "@nomiclabs/hardhat-waffle": "^2.0.1",
     "@nomicfoundation/hardhat-chai-matchers": "^1.0.6",
     "@nomicfoundation/hardhat-network-helpers": "^1.0.8",
     "@nomicfoundation/hardhat-toolbox": "^2.0.2",
-    "@nomiclabs/hardhat-ethers": "^2.2.3",
     "@nomiclabs/hardhat-etherscan": "^3.1.7",
     "@typechain/ethers-v5": "^10.2.0",
     "@typechain/hardhat": "^6.1.5",
     "@types/chai": "^4.3.4",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^18.16.0",
+    "@types/node": "^18.15.11",
+    "@typescript-eslint/eslint-plugin": "^5.30.5",
+    "@typescript-eslint/parser": "^5.30.5",
     "chai": "^4.3.7",
+    "merkletreejs": "^0.3.9",
+    "ts-node": "^10.9.1",
+    "typechain": "^8.1.1",
+    "typescript": "^5.2.2",
+    "eslint": "^7.32.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-config-standard": "^16.0.3",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-prettier": "^3.4.1",
+    "eslint-plugin-promise": "^5.2.0",
+    "eslint-plugin-security": "^1.7.1",
+    "ethereum-waffle": "^4.0.10",
+    "ethers": "^5.7.2",
     "hardhat": "^2.14.0",
+    "hardhat-deploy": "^0.11.26",
     "hardhat-gas-reporter": "^1.0.9",
     "husky": "^8.0.3",
+    "pinst": "^3.0.0",
+    "prettier": "^2.6.2",
+    "solc": "^0.8.15",
+    "solhint": "^3.3.7",
+    "solhint-plugin-prettier": "^0.0.5",
     "prettier-plugin-solidity": "^1.1.2",
-    "solidity-coverage": "^0.8.2",
-    "ts-node": "^10.9.1",
-    "typechain": "^8.1.1",
-    "typescript": "^5.0.4"
+    "solidity-coverage": "^0.8.2"
   },
   "dependencies": {
     "@biconomy-devx/account-contracts-v2": "^2.0.2",
@@ -77,10 +100,6 @@
     "ethers": "^5.6.8",
     "ganache": "^7.1.0",
     "ganache-cli": "^6.12.2",
-    "hardhat": "^2.9.5",
-    "hardhat-deploy": "^0.9.3",
-    "hardhat-deploy-ethers": "^0.3.0-beta.11",
-    "hardhat-gas-reporter": "^1.0.7",
     "solc": "^0.8.15",
     "solidity-bytes-utils": "^0.8.0",
     "source-map-support": "^0.5.19",

scripts/postpack-contracts.sh

@@ -0,0 +1,3 @@
+#!/bin/bash -xe
+#echo postpack for "contracts"
+rm -rf artifacts-filtered types dist

scripts/prepack-contracts.sh

@@ -0,0 +1,13 @@
+#!/bin/bash -xe
+#echo prepack for "contracts" 
+
+npx hardhat clean 
+npx hardhat compile
+
+rm -rf artifacts-filtered types dist
+
+mkdir -p artifacts-filtered
+# openzeppelin can be used separately. same for account-abstraction (kept it for now)
+cp `find  ./artifacts/contracts ./artifacts/@account-abstraction -type f | grep -v -E 'Test|dbg|gnosis|bls|IOracle'` artifacts-filtered
+npx typechain --target ethers-v5 --out-dir types artifacts-filtered/**
+npx tsc index.ts -d --outDir dist