401 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
alexcos20	b30173c692	add search Pool	2020-07-17 04:12:04 -07:00
Alex Coseru	40c1c00c93	Merge branch 'develop' into feature/balancer	2020-07-17 13:11:32 +03:00
alexcos20	648805c489	add configs for OceanPool	2020-07-17 03:10:04 -07:00
alexcos20	7b8f08e3c1	refactor	2020-07-17 02:51:04 -07:00
Ahmed Ali	c2244e50f3	Merge pull request #168 from oceanprotocol/dependabot/npm_and_yarn/typescript-3.9.7 ... Bump typescript from 3.9.6 to 3.9.7	2020-07-17 09:18:18 +02:00
Ahmed Ali	ad908291a4	Merge pull request #167 from oceanprotocol/dependabot/npm_and_yarn/mock-local-storage-1.1.14 ... Bump mock-local-storage from 1.1.12 to 1.1.14	2020-07-17 09:17:53 +02:00
dependabot[bot]	11f1ff9003	Bump typescript from 3.9.6 to 3.9.7 ... Bumps [typescript](https://github.com/Microsoft/TypeScript) from 3.9.6 to 3.9.7. - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Commits](https://github.com/Microsoft/TypeScript/compare/v3.9.6...v3.9.7) Signed-off-by: dependabot[bot] <support@github.com>	2020-07-17 01:03:32 +00:00
dependabot[bot]	95e6b0daf2	Bump mock-local-storage from 1.1.12 to 1.1.14 ... Bumps [mock-local-storage](https://github.com/letsrock-today/mock-local-storage) from 1.1.12 to 1.1.14. - [Release notes](https://github.com/letsrock-today/mock-local-storage/releases) - [Commits](https://github.com/letsrock-today/mock-local-storage/compare/v1.1.12...v1.1.14) Signed-off-by: dependabot[bot] <support@github.com>	2020-07-17 01:03:01 +00:00
Matthias Kretschmann	c1592eb7b5	Release 0.1.5 v0.1.5	2020-07-16 14:26:59 +02:00
Matthias Kretschmann	e24f250641	Merge pull request #165 from oceanprotocol/fix/typings-exports ... Fix DDO interfaces typings export	2020-07-16 14:18:33 +02:00
Matthias Kretschmann	ab6cea39d4	fix metadata interfaces exports	2020-07-16 13:52:50 +02:00
Matthias Kretschmann	b7cab2dee7	ignore DS_Store	2020-07-16 13:52:32 +02:00
Matthias Kretschmann	108d794c22	security fixes	2020-07-16 13:50:47 +02:00
Matthias Kretschmann	ecc35943fa	import fix	2020-07-16 13:40:48 +02:00
Alex Coseru	4455c70af8	Merge pull request #164 from oceanprotocol/feature/rinkeby_helper ... add rinkeby to known configs	2020-07-16 13:14:41 +03:00
alexcos20	5d055fb485	revert estimategas params	2020-07-15 23:40:43 -07:00
alexcos20	24265617b0	more config helpers	2020-07-15 23:33:54 -07:00
Alex Coseru	b705dfd3b8	Update ConfigHelper.ts	2020-07-16 09:23:36 +03:00
alexcos20	8363c79c0b	lint fix	2020-07-15 23:18:53 -07:00
alexcos20	210e32579d	add some debug	2020-07-15 23:09:57 -07:00
alexcos20	f7a1a4cb44	use S jsons from contracts	2020-07-15 22:45:51 -07:00
alexcos20	c86d70f7b0	Merge branch 'develop' into feature/balancer	2020-07-15 22:44:39 -07:00
alexcos20	4daa3e668d	add rinkeby to known configs	2020-07-15 22:21:57 -07:00
Ahmed Ali	8252990981	Release 0.1.4 v0.1.4	2020-07-15 21:11:37 +02:00
Alex Coseru	7d0af48e81	Merge pull request #163 from oceanprotocol/bug/fix_datatokens_abi ... Fix default abi's are not initialized correctly when initializing oceanlib	2020-07-15 21:31:27 +03:00
alexcos20	faff5f143d	bump contracts	2020-07-15 08:32:27 -07:00
Alex Coseru	2230098ca5	Update README_marketplace_flow.md	2020-07-15 17:53:12 +03:00
Alex Coseru	5fe1f6d70b	Update Datatokens.test.ts	2020-07-15 17:52:50 +03:00
Alex Coseru	4b3b053b32	Update Rinkeby.test.ts	2020-07-15 17:52:26 +03:00
Alex Coseru	f8a9049453	Update Simpleflow.test.ts	2020-07-15 17:51:37 +03:00
Alex Coseru	df17eb2de4	Update Marketplaceflow.test.ts	2020-07-15 17:51:18 +03:00
Alex Coseru	ce190b37a6	Update ComputeFlow.test.ts	2020-07-15 17:50:54 +03:00
Alex Coseru	60ae6735c8	Update Datatokens.ts	2020-07-15 17:38:29 +03:00
Alex Coseru	8184bc4a82	Update Datatokens.ts	2020-07-15 17:37:14 +03:00
Alex Coseru	a643bfcb27	Update Datatokens.ts	2020-07-15 17:34:40 +03:00
Ahmed Ali	36ba35f238	Release 0.1.3 v0.1.3	2020-07-15 14:55:00 +02:00
Ahmed Ali	285bb38943	Merge pull request #161 from oceanprotocol/feature/Fix_Incorrect-datatype-for-amount-in-datatoken.transferFrom ... always use Strings in Datatoken class	2020-07-15 14:53:44 +02:00
Alex Coseru	8b275367a2	Merge branch 'develop' into feature/Fix_Incorrect-datatype-for-amount-in-datatoken.transferFrom	2020-07-15 14:24:47 +03:00
alexcos20	a3824f91c6	always use Strings in Datatoken class	2020-07-15 04:22:37 -07:00
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