Skip to content

Commit

Permalink
Merge branch 'develop' into DS-82-add-start-end-of-pool
Browse files Browse the repository at this point in the history
  • Loading branch information
hejkerooo committed Nov 26, 2021
2 parents 7801dc4 + 0712343 commit 1659b68
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 258 deletions.
27 changes: 27 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,30 @@
# [3.3.0-alpha.21](https://github.com/energywebfoundation/iam-client-lib/compare/v3.3.0-alpha.20...v3.3.0-alpha.21) (2021-11-25)


### Bug Fixes

* **test:** increase faucet capacity ([d0b7ebb](https://github.com/energywebfoundation/iam-client-lib/commit/d0b7ebb90434d6729ade407c263a357d31fbb88f))

# [3.3.0-alpha.20](https://github.com/energywebfoundation/iam-client-lib/compare/v3.3.0-alpha.19...v3.3.0-alpha.20) (2021-11-25)


### Bug Fixes

* **cacheClient:** set auth header ([ba9e870](https://github.com/energywebfoundation/iam-client-lib/commit/ba9e8703fb275b6cd2b0d50c50cabff2e0431fda))


### Features

* **deps:** update ekc package ([839070a](https://github.com/energywebfoundation/iam-client-lib/commit/839070af1a4a346d3f9b3448593477f8772634f2))

# [3.3.0-alpha.19](https://github.com/energywebfoundation/iam-client-lib/compare/v3.3.0-alpha.18...v3.3.0-alpha.19) (2021-11-23)


### Features

* add hardcap to staking pool, improve tests ([65dd861](https://github.com/energywebfoundation/iam-client-lib/commit/65dd861347570fea3efa45c57ace5ebb4ab8acf6))
* integrate staking-pool ([0173b27](https://github.com/energywebfoundation/iam-client-lib/commit/0173b27cfccbe0419d3d11d20f4f1002f8f26093))

# [3.3.0-alpha.18](https://github.com/energywebfoundation/iam-client-lib/compare/v3.3.0-alpha.17...v3.3.0-alpha.18) (2021-11-22)


Expand Down
250 changes: 4 additions & 246 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "iam-client-lib",
"version": "3.3.0-alpha.18",
"version": "3.3.0-alpha.21",
"description": "Library for Decentralized Identity and Access Management",
"main": "dist/index.js",
"module": "dist/index.esm.js",
Expand Down Expand Up @@ -33,8 +33,8 @@
"build:typechain:stakingpool": "typechain --target ethers-v5 --out-dir ethers \"./node_modules/@energyweb/iam-contracts/dist/contracts/Staking*.json\"",
"build:typechain:staking-pool": "typechain --target ethers-v5 --out-dir ethers-staking \"./node_modules/@energyweb/staking-pool/dist/contracts/StakingPool.sol/StakingPool.json\"",
"prepare": "npm run build",
"start-rpc": "run-with-testrpc -m \"candy maple cake sugar pudding cream honey rich smooth crumble sweet treat\" -p 8544 --chainId 1337 -a 20 -e 1000 -l=10000000",
"ganache": "ganache-cli -m \"candy maple cake sugar pudding cream honey rich smooth crumble sweet treat\" -p 8544 --chainId 1337 -a 20 -e 1000 -l=10000000",
"start-rpc": "run-with-testrpc -m \"candy maple cake sugar pudding cream honey rich smooth crumble sweet treat\" -p 8544 --chainId 1337 -a 20 -e 10000000 -l=10000000",
"ganache": "ganache-cli -m \"candy maple cake sugar pudding cream honey rich smooth crumble sweet treat\" -p 8544 --chainId 1337 -a 20 -e 10000000 -l=10000000",
"test:watch": "npm run start-rpc -- \"jest --coverage --env=./jest.env.js --watchAll\"",
"test": "npm run start-rpc -- \"jest --no-cache --env=./jest.env.js\"",
"test:watch:windows": "concurrently \"npm run start-rpc\" \"jest --coverage --env=./jest.env.js --watchAll\""
Expand Down Expand Up @@ -63,7 +63,7 @@
"dependencies": {
"@babel/plugin-transform-runtime": "^7.15.8",
"@babel/runtime": "^7.12.5",
"@energyweb/ekc": "^0.6.4",
"@energyweb/ekc": "^0.6.5",
"@energyweb/iam-contracts": "^3.5.0",
"@energyweb/staking-pool": "^1.0.0-rc.5",
"@ensdomains/ens": "^0.4.5",
Expand Down
Loading

0 comments on commit 1659b68

Please sign in to comment.