Skip to content

Commit

Permalink
Merge branch 'release/v1.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Tobias Winkler committed Aug 17, 2018
2 parents 336aac1 + af2e1ab commit 2d39110
Show file tree
Hide file tree
Showing 94 changed files with 4,756 additions and 3,557 deletions.
15 changes: 13 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,20 @@
bundles/*
discify/*
dist/*
docs/_build/*
docs/blockchain/account-store.rst
docs/blockchain/event-hub.rst
docs/blockchain/executor.rst
docs/blockchain/name-resolver.rst
docs/blockchain/signer.rst
docs/common/logger.rst
docs/common/validator.rst
docs/contracts/contract-loader.rst
docs/dfs/dfs-interface.rst
docs/dfs/ipfs.rst
docs/encryption/cryptor-unencrypted.rst
node_modules/*
.env.local
ipfs-contractus
package-lock.json.*
package-lock.json
docs/_build/*
package-lock.json.*
5 changes: 3 additions & 2 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
.env
bundles/bcc/bcc.js.map
bundles/bcc/dbcpPath.json
discify/
docs/*
docu/
scripts/
src/
.env
tsconfig.json
tslint.json
tslint.json
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ const definition: Envelope = {
"name": "Data Contract Sample",
"description": "reiterance oxynitrate sat alternize acurative",
"version": "0.1.0",
"author": "contractus",
"author": "evan GmbH",
"dataSchema": {
"list_settable_by_member": {
"$id": "list_settable_by_member_schema",
Expand Down
17 changes: 17 additions & 0 deletions VERSIONS.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,23 @@
### Fixes
### Deprecations


## Version 1.1.0
### Features
- add support for wallet/proxy contracts (current implementation allows n wallet owner with a required confirmation count of 1, to allow grouping of accounts)
- add `ExecutorWallet`, that wraps calls to `Wallet`, but behaves like the normal `Executor`
- add `ExecutorAgent`, that wraps contract creation and interaction to edge-server actions
- add `Claims` module for issuing and managing claims about other parties
- add `getCallOwner` to get a `ServiceContracts`s call creator

### Fixes
- add validation for service definitions, calls and answers to `ServiceContract`
- remove `@evan.network/smart-contracts-admin` dependency

### Deprecations
- remove endpoint property from service contracts


## Version 1.0.2
### Features
- add support for adding sharing file hashes to cache to avoid duplicate contract calls
Expand Down
15 changes: 15 additions & 0 deletions docs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ SPHINXPROJ = blockchain-core
SOURCEDIR = .
BUILDDIR = _build

dbcpDocsUrl = "https://raw.githubusercontent.com/evannetwork/dbcp/develop/docs/"

# Put it first so that "make" without argument is like "make help".
help:
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
Expand All @@ -17,4 +19,17 @@ help:
# Catch-all target: route all unknown targets to Sphinx using the new
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
%: Makefile
# retrieve required docu files from dbcp
wget -P blockchain -N "$(dbcpDocsUrl)blockchain/account-store.rst"
wget -P blockchain -N "$(dbcpDocsUrl)blockchain/event-hub.rst"
wget -P blockchain -N "$(dbcpDocsUrl)blockchain/executor.rst"
wget -P blockchain -N "$(dbcpDocsUrl)blockchain/name-resolver.rst"
wget -P blockchain -N "$(dbcpDocsUrl)blockchain/signer.rst"
wget -P common -N "$(dbcpDocsUrl)common/logger.rst"
wget -P common -N "$(dbcpDocsUrl)common/validator.rst"
wget -P contracts -N "$(dbcpDocsUrl)contracts/contract-loader.rst"
wget -P dfs -N "$(dbcpDocsUrl)dfs/dfs-interface.rst"
wget -P dfs -N "$(dbcpDocsUrl)dfs/ipfs.rst"
wget -P encryption -N "$(dbcpDocsUrl)encryption/cryptor-unencrypted.rst"

@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
Binary file added docs/_static/agent_tx_transparent.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_static/wallet_tx_transparent.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
109 changes: 0 additions & 109 deletions docs/blockchain/account-store.rst

This file was deleted.

2 changes: 1 addition & 1 deletion docs/blockchain/description.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Description
- `Description <https://github.com/evannetwork/dbcp/tree/master/src/description.ts>`_
* - Source
- `description.ts <https://github.com/evannetwork/api-blockchain-core/tree/master/src/shared-description.ts>`_
* - Tests
* - Examples
- `description.spec.ts <https://github.com/evannetwork/api-blockchain-core/tree/master/src/shared-description.spec.ts>`_

The Description module is the main entry point for interacting with contract descriptions. It allows you to:
Expand Down
Loading

0 comments on commit 2d39110

Please sign in to comment.