[AA] unify aa-contracts package (#613)

* unify aa package * restore artifacts structure because deploy script would overwrite * build * remove outdir * check version * check version * remove npmignore * remove npmignore * package version * update prepack script * update prepack script * udpate integ * fix integ tests * Update packages/boba/account-abstraction/package.json --------- Co-authored-by: Ino Murko <[email protected]>
bobanetwork · Mar 2, 2023 · a159ed3 · a159ed3
1 parent 1b7d847
commit a159ed3
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 43 deletions.
diff --git a/packages/boba/account-abstraction/.gitignore b/packages/boba/account-abstraction/.gitignore
@@ -11,6 +11,7 @@ artifacts
 /deployments/localhost/
 /deployments/proxy/
 /typechain-types/
+/types/
 /reports/gas-used-output.color
 /coverage
 /coverage.json

diff --git a/packages/boba/account-abstraction/contracts/.npmignore b/packages/boba/account-abstraction/contracts/.npmignore
diff --git a/packages/boba/account-abstraction/contracts/package.json b/packages/boba/account-abstraction/contracts/package.json
diff --git a/...ba/account-abstraction/contracts/index.ts → packages/boba/account-abstraction/index.ts b/...ba/account-abstraction/contracts/index.ts → packages/boba/account-abstraction/index.ts
diff --git a/packages/boba/account-abstraction/package.json b/packages/boba/account-abstraction/package.json
@@ -1,9 +1,12 @@
 {
   "name": "@boba/accountabstraction",
   "version": "1.0.0",
-  "description": "BOBA Account Abstraction",
+  "description": "BOBA Account Abstraction (EIP 4337) contracts",
+  "main": "./dist/index.js",
   "scripts": {
-    "build": "yarn install && yarn compile",
+    "build": "yarn install && yarn compile && yarn prepack",
+    "prepack": "./scripts/prepack-contracts-package.sh",
+    "postpack": "./scripts/postpack-contracts-package.sh",
     "clean": "rm -rf cache artifacts typechain typechain-types",
     "compile": "./scripts/hh-wrapper compile",
     "tsc": "tsc",
@@ -24,6 +27,14 @@
     "runop-goerli": "AA_URL=https://account-abstraction-goerli.nethermind.io yarn runop --network goerli",
     "runop3": "hardhat run src/runop3.ts "
   },
+  "keywords": [
+    "solidity",
+    "ethereum",
+    "smart",
+    "contracts",
+    "account-abstraction",
+    "eip-4337"
+  ],
   "license": "ISC",
   "devDependencies": {
     "@eth-optimism/contracts": "^0.5.11",

diff --git a/packages/boba/account-abstraction/scripts/postpack-contracts-package.sh b/packages/boba/account-abstraction/scripts/postpack-contracts-package.sh
@@ -2,5 +2,5 @@
 #echo postpack for "contracts" package
 cd `dirname $0`/..
 pwd
-rm -rf contracts/artifacts contracts/types contracts/dist
+rm -rf artifacts types dist
 
diff --git a/packages/boba/account-abstraction/scripts/prepack-contracts-package.sh b/packages/boba/account-abstraction/scripts/prepack-contracts-package.sh
@@ -3,17 +3,9 @@
 
 cd `dirname $0`/..
 pwd
-if git status contracts | grep -v 'nothing to commit'|tee /dev/stderr |grep -q Untracked; then
-  exit 1
-fi
 
-yarn clean 
-yarn compile
-cd contracts
-
-rm -rf artifacts types dist
-
-mkdir -p artifacts
-cp `find  ../artifacts/contracts -type f | grep -v -E 'Test|dbg|gnosis|bls|IOracle'` artifacts/
-npx typechain --target ethers-v5 --out-dir types  artifacts/**
+mkdir -p artifacts_clean
+cp `find  ./artifacts/contracts -type f | grep -v -E 'Test|dbg|gnosis|bls|IOracle'` artifacts_clean/
+typechain --target ethers-v5 --out-dir types artifacts_clean/**
+rm -r artifacts_clean
 npx tsc index.ts -d --outDir dist