Merge branch 'master' into dev

atpar · Oct 4, 2020 · 6fd3426 · 6fd3426
2 parents dd3a7a6 + 504d149
commit 6fd3426
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 8 deletions.
diff --git a/lerna.json b/lerna.json
@@ -2,7 +2,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.4.6",
+  "version": "0.4.7",
   "npmClient": "yarn",
   "command": {
     "publish": {

diff --git a/packages/actus-solidity/package.json b/packages/actus-solidity/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atpar/actus-solidity",
-  "version": "0.4.5",
+  "version": "0.4.7",
   "description": "ACTUS smart contracts",
   "author": "atpar AG",
   "authors": [

diff --git a/packages/ap-contracts/ap-chain-snapshot.tar.gz b/packages/ap-contracts/ap-chain-snapshot.tar.gz
diff --git a/packages/ap-contracts/package.json b/packages/ap-contracts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atpar/ap-contracts",
-  "version": "0.4.6",
+  "version": "0.4.7",
   "description": "ACTUS protocol smart contracts",
   "author": "jo-es <johannes.escherich+github@atpar.io>",
   "homepage": "https://github.com/atpar/ap-monorepo#readme",
@@ -28,9 +28,10 @@
     "registry": "https://npm.pkg.github.com/"
   },
   "scripts": {
-    "build": "npm run compile && npm run generate-ts-bindings",
+    "build": "npm run compile && npm run generate-ts-bindings && npm run generate-ap-chain-snapshot",
     "compile": "node --max-old-space-size=4096 ./node_modules/.bin/buidler compile",
     "coverage": "node --max-old-space-size=4096 ./node_modules/.bin/buidler coverage",
+    "generate-ap-chain-snapshot": "./scripts/setup-ap-chain.sh --take-snapshot",
     "generate-ts-bindings": "rm -rf ./ts-bindings && typechain --target web3-v1 --outDir ./ts-bindings './build/contracts/*.json'",
     "lint": "solhint contracts/**/*.sol",
     "lint:fix": "solhint contracts/**/*.sol --fix",
@@ -47,7 +48,7 @@
     "**/web3-eth-contract": "1.2.4"
   },
   "dependencies": {
-    "@atpar/actus-solidity": "0.4.5",
+    "@atpar/actus-solidity": "0.4.7",
     "@nomiclabs/buidler": "1.4.3",
     "@nomiclabs/buidler-web3": "^1.3.4",
     "@openzeppelin/contracts-ethereum-package": "^3.0.0",

diff --git a/packages/ap-contracts/scripts/setup-ap-chain.sh b/packages/ap-contracts/scripts/setup-ap-chain.sh
@@ -19,14 +19,24 @@ npx --quiet ganache-cli \
   --gasLimit "8000000" \
   --defaultBalanceEther "5000000000" \
   --deterministic --mnemonic "helmet copy pause hood gun soon fork drum educate curious despair embrace" \
+  `if [[ $* == *--take-snapshot* ]]; then echo --db "./ap-chain-snapshot/db"; fi` \
   1>/dev/null &
 
 ganache_pid=$!
 
 sleep 1
 
-[ "$1" == "--no-deploy" ] || \
+if [[ $* != *--no-deploy* ]]; then
   npx --quiet buidler deploy --network ap-chain --tags deploy-ap-chain
+fi
+
+if [[ $* == *--take-snapshot* ]]; then
+  sleep 3
+  tar -zcf ap-chain-snapshot.tar.gz ap-chain-snapshot
+  rm -r ap-chain-snapshot
+  echo "✓ created snapshot"
+  exit 0
+fi
 
 echo "✓ ready"
 

diff --git a/packages/ap.js/package.json b/packages/ap.js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atpar/ap.js",
-  "version": "0.4.6",
+  "version": "0.4.7",
   "description": "Typescript Library for interacting with the ACTUS protocol",
   "author": "jo-es <johannes.escherich+github@atpar.io>",
   "homepage": "https://github.com/atpar/ap-monorepo#readme",
@@ -33,7 +33,7 @@
     "**/web3-eth-contract": "1.2.4"
   },
   "dependencies": {
-    "@atpar/ap-contracts": "0.4.6",
+    "@atpar/ap-contracts": "0.4.7",
     "@types/eth-sig-util": "^2.1.0",
     "@types/socket.io": "^2.1.2",
     "@types/socket.io-client": "^1.4.32",