15 Commits

Author	SHA1	Message	Date
Ahmed Ali	5f95c67e3e	fix lint	2020-06-29 18:20:56 +02:00
Ahmed Ali	5ac2a05172	Merge branch 'feature/marketplace-flow' of https://github.com/oceanprotocol/ocean-lib-js into feature/marketplace-flow	2020-06-29 18:19:20 +02:00
Ahmed Ali	6adac7b6f5	fix allowance in datatoken	2020-06-29 18:18:57 +02:00
arsenyjin	94377bd3ab	add bob gets datatokens	2020-06-29 12:05:17 +02:00
Ahmed Ali	2025527f97	remove some stuff	2020-06-29 09:46:25 +02:00
Ahmed Ali	a786c83373	integrate barge	2020-06-26 19:38:52 +02:00
arsenyjin	c9de363919	wip encrypt error	2020-06-25 15:52:33 +02:00
arsenyjin	712bb76dbc	wip ocean.assets.create	2020-06-25 00:18:47 +02:00
arsenyjin	5ca06863c2	wip: add marketplace flow	2020-06-24 12:45:35 +02:00
arsenyjin	d9c478b71f	wip add assets.create	2020-06-23 19:13:55 +02:00
arsenyjin	8193838a96	fix tests lint	2020-06-22 13:21:51 +02:00
arsenyjin	68f435a11d	add rinkeby test	2020-06-22 08:59:02 +02:00
arsenyjin	507f5f656d	fix remove console.log	2020-06-22 05:11:34 +02:00
arsenyjin	c16e277fde	add marketplace flow	2020-06-22 05:08:51 +02:00
arsenyjin	968f5038e9	add simple publish dataset	2020-06-21 13:57:59 +02:00