73 Commits

Author	SHA1	Message	Date
Pedro Gutiérrez	68d551dc09	improves some error messages	2019-01-25 10:53:53 +01:00
Pedro Gutiérrez	86b406ad2e	fixed linter issues	2019-01-24 10:58:05 +01:00
Pedro Gutiérrez	83cf56b57e	fixed error related to asset consuming #114	2019-01-24 10:48:48 +01:00
Pedro Gutiérrez	f71e7e345a	linter fixes	2019-01-22 14:18:58 +01:00
Pedro Gutiérrez	21b38402ca	changed some methods names and marking as deprectated #65	2019-01-15 11:34:45 +01:00
Pedro Gutiérrez	89dbc10532	added comments to main Ocean class #79	2019-01-09 16:39:18 +01:00
Jernej Pregelj	e953180700	lint fixes	2018-12-17 17:43:45 +01:00
Jernej Pregelj	81a282af28	return file urls	2018-12-17 16:46:19 +01:00
Sebastian Gerske	6ea480fd47	enhanced did handling	2018-12-17 15:54:58 +01:00
Sebastian Gerske	a0648b4b84	remove 0x prefix from serviceAgreementId	2018-12-17 14:29:09 +01:00
Sebastian Gerske	09191fab59	rollback did containing 0x	2018-12-17 14:17:35 +01:00
Sebastian Gerske	d6495036d7	Merge branch 'develop' into fix/file_download	2018-12-14 16:15:36 +01:00
Sebastian Gerske	77a410c607	removed file-saver and added a callback with the content	2018-12-14 16:12:23 +01:00
ssallam	233aede5f6	Generate assetId with 0x prefix, update all references to reflect this. This makes it similar to squid-py and fixes an issue in payAsset where the asset id in the condition param had double 0x prefix when paying a service agreement for an asset created in squid-py.	2018-12-14 13:40:08 +01:00
Sebastian Gerske	ce009dcd94	remove fs because it does not work in the browser	2018-12-10 13:26:33 +01:00
ssallam	4f05e3f455	fix saving downloaded file.	2018-12-10 00:15:40 +01:00
ssallam	1756903005	Handle the access granted event. Invoke the consume endpoint. Fix issue in the generated serviceEndpoint.	2018-12-08 00:46:18 +01:00
Sebastian Gerske	d221b14931	fix pay asset	2018-12-07 17:20:20 +01:00
Sebastian Gerske	ce7027590e	new access template	2018-12-07 15:19:16 +01:00
Sebastian Gerske	d4b6366a4a	latest adoption	2018-12-05 12:40:38 +01:00
ssallam	04c8a7feda	Fix aquarius url and the keeper registered url type.	2018-12-04 21:21:13 +01:00
Sebastian Gerske	43a5e53d57	fix brizo connection	2018-11-26 15:24:59 +01:00
Sebastian Gerske	3bf09e63a1	added executeAgreement event listener	2018-11-23 16:09:31 +01:00
Sebastian Gerske	a904649c33	add event listener for lockPayment	2018-11-23 16:01:42 +01:00
Sebastian Gerske	17f1b3e53e	fix listen once	2018-11-23 14:28:41 +01:00
Sebastian Gerske	0c3c21b4c5	fix listener, add eventing, moved generation of conditions to template structure	2018-11-23 14:14:35 +01:00
Sebastian Gerske	1b967896df	small ddo adoptions	2018-11-23 12:40:18 +01:00
Sebastian Gerske	8d018633a9	added buy asset and grant access samples, prepare for consumption	2018-11-23 09:17:30 +01:00
Sebastian Gerske	43fe8634d2	fix lockPayment	2018-11-22 09:22:27 +01:00
Sebastian Gerske	efeb0fa11f	fixed lint	2018-11-21 15:10:09 +01:00
diminator	eef46c7a1c	some style changes for readability	2018-11-21 14:59:22 +01:00
Sebastian Gerske	cc91cdb054	map parameter values	2018-11-20 10:43:11 +01:00
Sebastian Gerske	dfff8fc228	added event wireup ... added lock payment added fulfilmentOperators added declarative way to describe dependencies added service agreement termination	2018-11-20 09:13:03 +01:00
Sebastian Gerske	a2bfe0a816	added connection to brizo	2018-11-19 12:16:11 +01:00
Sebastian Gerske	58cd2810ed	adapt changes to ddo condition structure	2018-11-16 15:15:45 +01:00
Sebastian Gerske	02c36d12ad	fix issue with generating public key, adapt interface changes of aquarius	2018-11-16 14:26:58 +01:00
Sebastian Gerske	ba4e2d4656	adapted changes from squid discussion	2018-11-14 15:44:25 +01:00
Sebastian Gerske	3983c83eb9	added support for POA network	2018-11-14 09:36:37 +01:00
Sebastian Gerske	0c46763095	encrypt contentUrls at once instead separate, move generation of serviceAgreementId outside of signAgreement and executeAgreement in ocean object, hardened sign and execute of service agreements, wrote unit tests	2018-11-12 12:09:42 +01:00
Sebastian Gerske	86d1621046	add get public key method to account	2018-11-12 10:06:24 +01:00
Sebastian Gerske	c425f03efd	separate sign and execute agreement	2018-11-12 08:33:19 +01:00
Sebastian Gerske	2df3a68abf	fix 500 on aquarius, hardened tests, avoided loading contracts more than once per chain and item	2018-11-09 11:16:22 +01:00
Sebastian Gerske	6df097ea8f	added brizo	2018-11-09 10:43:29 +01:00
Sebastian Gerske	77213a44e1	update registerasset flow	2018-11-07 15:05:16 +01:00
Sebastian Gerske	cbf0b55831	moved test code to test, added metadata, added endpoint generation to aquarius, removed unused code and tests, updated to latest keeper	2018-11-07 14:33:56 +01:00
Sebastian Gerske	2194ae59c3	adapt changes from keeper 0.3.18	2018-11-07 09:35:47 +01:00
Sebastian Gerske	edb2d43d99	stop register asset in market on register	2018-11-06 16:23:48 +01:00
Sebastian Gerske	6ab85631ca	move template registration outside of asset registration again	2018-11-06 16:13:12 +01:00
Sebastian Gerske	86be0cc6d5	added search by text, added templates for fitchain and access	2018-11-05 17:50:56 +01:00
Sebastian Gerske	1874e24b61	expose both search methods	2018-11-05 14:58:58 +01:00