Skip to content

Commit

Permalink
Merge pull request #2 from keyko-io/feature/use-common-ddos
Browse files Browse the repository at this point in the history
Feature/use common ddos
  • Loading branch information
Enrique Ruiz committed Apr 29, 2020
2 parents 445c136 + e151752 commit 0ee7a6b
Show file tree
Hide file tree
Showing 87 changed files with 827 additions and 3,328 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/pythonpackage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.6, 3.7]
python-version: [3.6 ,3.7]

steps:
- uses: actions/checkout@v2
Expand All @@ -27,8 +27,8 @@ jobs:
run: |
git clone https://github.com/keyko-io/nevermind-tools
cd nevermind-tools
export KEEPER_VERSION=latest
export AQUARIUS_VERSION=latest
export KEEPER_VERSION=v0.1.2
export METADATA_VERSION=latest
rm -rf "${HOME}/.nevermind/nevermind-contracts/artifacts"
bash -x start_nevermind.sh --no-commons --no-gateway --no-faucet --no-dashboard --latest 2>&1 > start_nevermind.log &
cd ..
Expand Down
15 changes: 12 additions & 3 deletions .github/workflows/release-github.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,20 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v2
- name: changelog
uses: scottbrenner/generate-changelog-action@master
id: Changelog
env:
REPO: ${{ github.repository }}
- name: Release
uses: softprops/action-gh-release@v1
if: startsWith(github.ref, 'refs/tags/')
with:
files: |
target/*.jar
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ github.ref }}
release_name: Release ${{ github.ref }}
body: |
${{ steps.Changelog.outputs.changelog }}
draft: false
prerelease: false
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ docker/docs
squid_py.db
consume-downloads
.log
start_ocean.log
start_nevermind.log
errors.log.*
info.log.*
*.db
248 changes: 0 additions & 248 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,248 +0,0 @@
History
=======

0.6.14 (Jul 1st, 2019)
-----------------------
* Events monitor.

0.6.13 (Jun 22nd, 2019)
-----------------------
* Pick up always last version of contracts.
* Don't allow dispenser in pacific

0.6.12 (Jun 21st, 2019)
-----------------------
* Fix processing events related to service agreements
* Fix release reward after access is granted
* Increase test coverage

0.6.11 (Jun 14th, 2019)
----------------------
* Fix issue in condition method.
* Fix problem with brizo mock.

0.6.10 (Jun 11th, 2019)
----------------------
* Allow separate config per ocean instance
* Fix issue in timeout processing in multi event listener
* Refactor registering of agreement events watchers
* Add interface and implementation to support provider handling of new agreement events (in squid, caller does not need to implement own handler)

0.6.9 (Jun 6th, 2019)
----------------------
* Remove waiting for transaction receipt when handling agreement events.

0.6.8 (Jun 5th, 2019)
----------------------
* Eliminate processing the same event repeatedly
* Fix a database issue

0.6.7 (May 29th, 2019)
----------------------
* Fix issue in the signature.

0.6.6 (May 28th, 2019)
----------------------
* Begin checksum with 0x.
* Fix small bugs.
* Add version info of the contracts.
* Manage price as a string.

0.6.5 (May 16th, 2019)
----------------------
* Add ocean auth module to support handling signed token.

0.6.4 (May 7th, 2019)
----------------------
* Use the proper version of keeper-contracts that supports consumer creating service agreement.

0.6.3 (April 30th, 2019)
------------------------
* Update `assets.order` to use `agreements.create` instead of `agreements.send`

0.6.2 (April 30th, 2019)
------------------------
* Revert change that was breaking compatibility

0.6.1 (April 30th, 2019)
------------------------
* The agreement can be created by the publisher and the consumer
* Allow to consume individual assets using the index
* Fix some mistakes in the ddo generation
* Improve logging

0.6.0 (April 24th, 2019)
------------------------
* Get list of the Assets Published by an user
* Get list of the Assets Purchased by an user
* Get the SEA status
* Get the Owner of an Asset
* Expose an additional consume interface allowing to use index parameter
* Consumer can initialize a SEA on-chain

0.5.14 (April 5th, 2019)
-------------------------
* Update chunk_size in the requests.
* Page should be equal or bigger than 1.

0.5.13 (April 5th, 2019)
-------------------------
* Working with the new Response for queries in aquarius

0.5.12 (April 5th, 2019)
-------------------------
* Custom httpProvider to manage better the connections pool.

0.5.11 (April 1st, 2019)
-------------------------
* Fix to solve an issue handling the signature in web3.
* Prepare changes to make Brizo work with squid-js

0.5.10 (March 29th, 2019)
-------------------------
* Upgrade to keeper contracts 0.9.0
* Update tests and examples to the requirements in the files section of the ddo.

0.5.9 (March 27th, 2019)
-------------------------
* New event handler.
* Keep the files in the ddo.

0.5.8 (March 26th, 2019)
-------------------------
* Upgrade to keeper-contracts 0.8.8.

0.5.7 (March 25th, 2019)
-------------------------
* Unify authentication and publicKey parameters in the ddo.

0.5.6 (March 22nd, 2019)
-------------------------
* Upgrade to the changes in the did registry contract in version 0.8.7.

0.5.5 (March 21st, 2019)
-------------------------
* Fix issue with the validation of the signature.
* Add docstrings missed.

0.5.4 (March 20th, 2019)
-------------------------
* Use personal_sendTransaction to execute smart contract functions to avoid having to unlock account before each transaction.
* Improved error handling.
* Better control of http requests connection pool.

0.5.3 (March 18th, 2019)
------------------------
* Update to keeper 0.8.6

0.5.2 (March 14th, 2019)
-------------------------
* This release works with keeper v0.8.5 which automatically propses/approves the agreement template. Brizo and squid-py should work without the need for worring about approving the agreement template.

0.5.1 (March 13th, 2019)
-------------------------
* Small bug fixed.

0.5.0 (March 6th, 2019)
-------------------------
* Working with keeper-contracts v0.8.1.
* Update with the new squid API.

0.4.4 (February 21st, 2019)
-------------------------
* Change log level in the event listener.

0.4.3 (February 19th, 2019)
-------------------------
* Unlock missed account to avoid Nile error

0.4.2 (February 7th, 2019)
-------------------------
* Secret store bug fixed

0.4.1 (February 6th, 2019)
-------------------------
* Include template in the distribution

0.4.0 (February 6th, 2019)
-------------------------
* This release implements the latest v0.1 squid-api.

0.3.3 (February 6th, 2019)
-------------------------
* Create checksum in the register_asset method

0.3.2 (January 30th, 2019)
-------------------------
* Fixing in the secret-store
* Remove circular dependencies

0.3.1 (January 30th, 2019)
-------------------------
* Support changes in OEP-8

0.3.0 (January 29th, 2019)
-------------------------
* Enable squid to run with keeper-contracts v0.6.x

0.2.24 (January 21st, 2019)
---------------------------
* Remove dids in the services

0.2.21 (January 15th, 2019)
---------------------------
* Fixes a bug that breaks resolving assets in brizo.

0.2.17 (December 18th, 2019)
---------------------------
* Unify DID format across different languages.
* Move unlock_account to the Account class
* Detect existing service agreement and raise error before executing the agreement on-chain
* Raise error in execute_service_agreement when consumer signature is invalid to allow Brizo to provide more accurate error message
* Simplify imports

0.2.14 (December 7th, 2019)
---------------------------
* New docker images need this update.

0.2.11 (November 28th, 2019)
---------------------------
Progress in Service Level Agreements and consume workflow.

This version is still to be integration tested.

0.2.7 (November 19th, 2019)
---------------------------
* Fix, include .json service agreement template and path handling

0.2.6 (November 19th, 2019)
---------------------------
* Refactor of Service Level Agreement flow
* Cleanup, bugfixes

0.2.5 (November 16th, 2019)
---------------------------
* Service agreement handlers
* Access conditions
* General refactoring

0.2.4 (November 16th, 2019)
---------------------------
* Minor fixes to the version dependencies (web3==4.5.0, and including all sub-packages).

0.2.1 (October 30th, 2019)
---------------------------
* Following the new squid API.
* Complete refactor of methods.

0.1.3 (October 12th, 2019)
---------------------------
* Implementation of the new API methods
* First squid useful version







2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
include CHANGELOG.md
include LICENSE
include README.md
include squid_py/agreements/access_sla_template.json
include nevermind_skd_py/agreements/access_sla_template.json

recursive-include tests *
recursive-exclude * __pycache__
Expand Down

0 comments on commit 0ee7a6b

Please sign in to comment.