512 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ahmed Ali	422f151e5b	Merge pull request #159 from oceanprotocol/fix/abi-data-type ... Fix ABIs data types	2020-07-15 13:04:43 +02:00
Alex Coseru	1ebdff5321	Merge pull request #158 from oceanprotocol/feature/balances ... add ocean token & any token balance to Account	2020-07-15 13:59:45 +03:00
alexcos20	fec14ec139	fix tsc	2020-07-15 03:42:18 -07:00
Ahmed Ali	edb2d53fe3	fix (#152)	2020-07-15 12:37:45 +02:00
Ahmed Ali	b9891bf4bd	Merge pull request #157 from oceanprotocol/feature/cleanup-test ... feature/cleanup-test	2020-07-15 12:35:45 +02:00
alexcos20	a03c9b888f	add ocean token & any token balance to Account	2020-07-15 03:25:01 -07:00
alexcos20	13095ce710	add ocean token & any token balance to Account	2020-07-15 03:19:00 -07:00
ssallam	0e74521614	Merge branch 'develop' into feature/cleanup-test	2020-07-15 12:18:36 +02:00
Ahmed Ali	78b7b09133	Merge pull request #155 from oceanprotocol/feature/travis_update ... Update .travis.yml	2020-07-15 12:16:33 +02:00
ssallam	a302be751d	Use latest provider tag in travis setup.	2020-07-15 12:13:37 +02:00
ssallam	33b4076cff	Fix test.	2020-07-15 12:12:46 +02:00
Ahmed Ali	318d1dd5a2	fix provider version	2020-07-15 12:06:11 +02:00
ssallam	8297808f55	Cleanup style issues/warnings in compute test.	2020-07-15 12:01:02 +02:00
Ahmed Ali	46ab602f28	Merge pull request #156 from oceanprotocol/feature/add_oceanTokenAddress ... Update ConfigHelper.ts	2020-07-15 12:00:32 +02:00
alexcos20	6cbbef5626	fix lint	2020-07-15 02:44:08 -07:00
Alex Coseru	e13ddbc4c0	Update Config.ts	2020-07-15 12:30:41 +03:00
Alex Coseru	4191efb3b4	Update ConfigHelper.ts	2020-07-15 12:24:20 +03:00
Ahmed Ali	4f4f9ab929	Merge pull request #150 from oceanprotocol/fix/contracts-dependencies ... Fix/contracts dependencies	2020-07-15 10:53:18 +02:00
Ahmed Ali	bb44008a3f	Update ComputeFlow.test.ts	2020-07-15 10:13:55 +02:00
Alex Coseru	382bed5d4f	Update .travis.yml ... use provider-py latest from barge	2020-07-15 10:45:16 +03:00
Matthias Kretschmann	4961032b3f	Merge pull request #153 from oceanprotocol/fix/missing-doc ... added missing section	2020-07-14 19:26:42 +02:00
Manan Patel	75632372dc	added missing section ... Installation section was missing how to install library	2020-07-14 20:56:43 +05:30
Matthias Kretschmann	3716c5d1b6	dependencies cleanup	2020-07-14 13:29:52 +02:00
Matthias Kretschmann	c5d7eef755	move @oceanprotocol/contracts to dependencies	2020-07-14 13:24:41 +02:00
Ahmed Ali	6398646954	Release 0.1.2 v0.1.2	2020-07-14 13:09:33 +02:00
Ahmed Ali	ed18f8182d	Merge pull request #147 from oceanprotocol/bug/fix_dt_decimals ... DataTokens - use wei in the library	2020-07-14 12:56:06 +02:00
alexcos20	dc5b252842	fixes #144	2020-07-14 03:44:52 -07:00
alexcos20	ed8eef68d8	resolve comments	2020-07-14 03:19:16 -07:00
alexcos20	1b2522e679	moved everything to wei	2020-07-14 02:33:54 -07:00
Ahmed Ali	088f267348	minor doc fix	2020-07-14 10:47:28 +02:00
Ahmed Ali	5e511ac4ac	Merge pull request #146 from oceanprotocol/fix/documentation ... Fix/documentation	2020-07-14 10:44:53 +02:00
Ahmed Ali	2669b2be62	minor fix	2020-07-14 10:42:52 +02:00
Ahmed Ali	4adc824d51	add simple flow	2020-07-14 10:41:30 +02:00
Ahmed Ali	9368a80e1b	fix marketplace docs	2020-07-14 10:40:00 +02:00
Ahmed Ali	5b06940bc8	Merge pull request #148 from oceanprotocol/dependabot/npm_and_yarn/types/node-14.0.23 ... Bump @types/node from 14.0.22 to 14.0.23	2020-07-14 09:06:36 +02:00
dependabot[bot]	6ba3c3bfea	Bump @types/node from 14.0.22 to 14.0.23 ... Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 14.0.22 to 14.0.23. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) Signed-off-by: dependabot[bot] <support@github.com>	2020-07-14 01:07:40 +00:00
alexcos20	82178ee3dc	added toWei/fromWei in datatokens	2020-07-13 11:13:36 -07:00
Ahmed Ali	414445bb77	fix simple flow	2020-07-13 16:17:17 +02:00
Ahmed Ali	0c7e867a47	Merge pull request #130 from oceanprotocol/feature/compute-interface ... feature/compute-interface	2020-07-13 12:41:15 +02:00
Ahmed Ali	1e3d3eca4c	Merge pull request #143 from oceanprotocol/feature/compute-test ... Feature/compute test	2020-07-13 12:33:17 +02:00
Ahmed Ali	85776919ec	minor cleaning	2020-07-13 11:59:22 +02:00
alexcos20	f8ef12f8dc	add compute stop and fix job with algodid	2020-07-13 02:51:17 -07:00
alexcos20	2deca53cc7	add assets.order by index	2020-07-13 02:34:31 -07:00
Ahmed Ali	61786ce532	comment restart for now	2020-07-13 11:24:05 +02:00
Ahmed Ali	27168cc64d	Merge branch 'feature/compute-interface' into feature/compute-test	2020-07-13 11:17:47 +02:00
alexcos20	fbbffa4eff	Merge branch 'feature/compute-test' of https://github.com/oceanprotocol/ocean-lib-js into feature/compute-test	2020-07-13 02:13:00 -07:00
alexcos20	fdbc692064	add compute test with published algo	2020-07-13 02:12:34 -07:00
ssallam	7ef5c6b7b0	Fix storing encrypted files in new ddo.	2020-07-13 10:48:25 +02:00
alexcos20	2bf04170d7	minor doc fix	2020-07-13 01:14:52 -07:00
alexcos20	4e45956eda	add more complex tests	2020-07-13 01:11:53 -07:00