Skip to content

Commit 2d39110

Browse files
author
Tobias Winkler
committed
Merge branch 'release/v1.1.0'
2 parents 336aac1 + af2e1ab commit 2d39110

94 files changed

Lines changed: 4756 additions & 3557 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,20 @@
11
bundles/*
22
discify/*
33
dist/*
4+
docs/_build/*
5+
docs/blockchain/account-store.rst
6+
docs/blockchain/event-hub.rst
7+
docs/blockchain/executor.rst
8+
docs/blockchain/name-resolver.rst
9+
docs/blockchain/signer.rst
10+
docs/common/logger.rst
11+
docs/common/validator.rst
12+
docs/contracts/contract-loader.rst
13+
docs/dfs/dfs-interface.rst
14+
docs/dfs/ipfs.rst
15+
docs/encryption/cryptor-unencrypted.rst
416
node_modules/*
517
.env.local
618
ipfs-contractus
7-
package-lock.json.*
819
package-lock.json
9-
docs/_build/*
20+
package-lock.json.*

.npmignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
.env
21
bundles/bcc/bcc.js.map
32
bundles/bcc/dbcpPath.json
43
discify/
4+
docs/*
55
docu/
66
scripts/
77
src/
8+
.env
89
tsconfig.json
9-
tslint.json
10+
tslint.json

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ const definition: Envelope = {
272272
"name": "Data Contract Sample",
273273
"description": "reiterance oxynitrate sat alternize acurative",
274274
"version": "0.1.0",
275-
"author": "contractus",
275+
"author": "evan GmbH",
276276
"dataSchema": {
277277
"list_settable_by_member": {
278278
"$id": "list_settable_by_member_schema",

VERSIONS.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,23 @@
55
### Fixes
66
### Deprecations
77

8+
9+
## Version 1.1.0
10+
### Features
11+
- add support for wallet/proxy contracts (current implementation allows n wallet owner with a required confirmation count of 1, to allow grouping of accounts)
12+
- add `ExecutorWallet`, that wraps calls to `Wallet`, but behaves like the normal `Executor`
13+
- add `ExecutorAgent`, that wraps contract creation and interaction to edge-server actions
14+
- add `Claims` module for issuing and managing claims about other parties
15+
- add `getCallOwner` to get a `ServiceContracts`s call creator
16+
17+
### Fixes
18+
- add validation for service definitions, calls and answers to `ServiceContract`
19+
- remove `@evan.network/smart-contracts-admin` dependency
20+
21+
### Deprecations
22+
- remove endpoint property from service contracts
23+
24+
825
## Version 1.0.2
926
### Features
1027
- add support for adding sharing file hashes to cache to avoid duplicate contract calls

docs/Makefile

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ SPHINXPROJ = blockchain-core
88
SOURCEDIR = .
99
BUILDDIR = _build
1010

11+
dbcpDocsUrl = "https://raw.githubusercontent.com/evannetwork/dbcp/develop/docs/"
12+
1113
# Put it first so that "make" without argument is like "make help".
1214
help:
1315
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
@@ -17,4 +19,17 @@ help:
1719
# Catch-all target: route all unknown targets to Sphinx using the new
1820
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
1921
%: Makefile
22+
# retrieve required docu files from dbcp
23+
wget -P blockchain -N "$(dbcpDocsUrl)blockchain/account-store.rst"
24+
wget -P blockchain -N "$(dbcpDocsUrl)blockchain/event-hub.rst"
25+
wget -P blockchain -N "$(dbcpDocsUrl)blockchain/executor.rst"
26+
wget -P blockchain -N "$(dbcpDocsUrl)blockchain/name-resolver.rst"
27+
wget -P blockchain -N "$(dbcpDocsUrl)blockchain/signer.rst"
28+
wget -P common -N "$(dbcpDocsUrl)common/logger.rst"
29+
wget -P common -N "$(dbcpDocsUrl)common/validator.rst"
30+
wget -P contracts -N "$(dbcpDocsUrl)contracts/contract-loader.rst"
31+
wget -P dfs -N "$(dbcpDocsUrl)dfs/dfs-interface.rst"
32+
wget -P dfs -N "$(dbcpDocsUrl)dfs/ipfs.rst"
33+
wget -P encryption -N "$(dbcpDocsUrl)encryption/cryptor-unencrypted.rst"
34+
2035
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
12.1 KB
Loading
10.5 KB
Loading

docs/blockchain/account-store.rst

Lines changed: 0 additions & 109 deletions
This file was deleted.

docs/blockchain/description.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Description
1212
- `Description <https://github.com/evannetwork/dbcp/tree/master/src/description.ts>`_
1313
* - Source
1414
- `description.ts <https://github.com/evannetwork/api-blockchain-core/tree/master/src/shared-description.ts>`_
15-
* - Tests
15+
* - Examples
1616
- `description.spec.ts <https://github.com/evannetwork/api-blockchain-core/tree/master/src/shared-description.spec.ts>`_
1717

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

0 commit comments

Comments
 (0)