399 Commits

Author	SHA1	Message	Date
Pedro Gutiérrez	b1715be11a	Fix agreement status generation.	2019-03-18 13:37:49 +01:00
Pedro Gutiérrez	4f469b2ab5	Use condition contracts hash generation to generate the signature.	2019-03-18 13:37:49 +01:00
Pedro Gutiérrez	f8b3d839eb	Add a way to get the status of a agreement.	2019-03-18 13:37:49 +01:00
Pedro Gutiérrez	51fbbc887e	Fix dependencies references on Escrow template.	2019-03-18 13:37:49 +01:00
Pedro Gutiérrez	0ffa0e4204	Add initial condition and agreement store managers.	2019-03-18 13:37:49 +01:00
Pedro Gutiérrez	6a4df9768a	Move signature values generation to template.	2019-03-18 13:37:49 +01:00
Pedro Gutiérrez	c213a8d3ca	Create Signature integration test and fixed/improved the generation of hashes.	2019-03-18 13:37:49 +01:00
Pedro Gutiérrez	ae070be011	Use the decimals of OceanToken to return the correct balance.	2019-03-18 13:37:49 +01:00
Pedro Gutiérrez	44a611248e	Create helper to fill some common attributes on service agreement template on DDO.	2019-03-18 13:37:49 +01:00
Pedro Gutiérrez	e7b9f990b6	Add conversion helpers for did:op: prefixes.	2019-03-18 13:37:49 +01:00
Pedro Gutiérrez	136250b70c	Move access service template used on the DDO to each agreement template.	2019-03-18 13:37:49 +01:00
Pedro Gutiérrez	4f28092014	Improved signature helper using fallback non-personal sign method.	2019-03-18 13:37:49 +01:00
Pedro Gutiérrez	51aa0fbf64	Clean and simplify template related typings.	2019-03-18 13:37:49 +01:00
Pedro Gutiérrez	3a5fba6e21	Added tests on Conditions	2019-03-18 13:37:49 +01:00
Pedro Gutiérrez	c57121e45b	checking the 0x prefix on all the interaction with contracts	2019-03-18 13:37:49 +01:00
Pedro Gutiérrez	8a0679b2d4	added a helper to transform 0x prefixed values	2019-03-18 13:37:49 +01:00
Pedro Gutiérrez	86906b393f	added OceanAgreementsConditions submodule	2019-03-18 13:37:49 +01:00
Pedro Gutiérrez	f7cd71ac33	complete Escrow template flow	2019-03-18 13:37:49 +01:00
Pedro Gutiérrez	c9b383223b	fixed some typing issues	2019-03-18 13:37:49 +01:00
Pedro Gutiérrez	5ec624b2a5	initial implementation of templates and conditions	2019-03-18 13:37:49 +01:00
Pedro Gutiérrez	5c96be1b0c	ignored non stable tests	2019-02-26 00:18:07 +01:00
Pedro Gutiérrez	0410793286	linter fixes	2019-02-26 00:18:07 +01:00
Pedro Gutiérrez	6d5be0db75	fixed consume flow	2019-02-26 00:18:07 +01:00
Pedro Gutiérrez	181940a62c	allow having different config in integration test	2019-02-26 00:18:07 +01:00
Pedro Gutiérrez	e61e7b8881	improved Logger allowing different log level	2019-02-26 00:18:07 +01:00
Pedro Gutiérrez	fce88aa528	added SecretStore integration test	2019-02-26 00:18:07 +01:00
Pedro Gutiérrez	dd5c90eb9f	added OceanTokens initialization on Ocean	2019-02-26 00:18:07 +01:00
Pedro Gutiérrez	fce3a09285	added Ocean.tokens module	2019-02-26 00:18:07 +01:00
Pedro Gutiérrez	057714988a	added some missed methods on Ocean.accounts module	2019-02-26 00:18:07 +01:00
Pedro Gutiérrez	8dcdf0a851	moved ID generator	2019-02-26 00:18:07 +01:00
Pedro Gutiérrez	3fd8f995f6	added Ocean.secretStore module	2019-02-26 00:18:07 +01:00
Pedro Gutiérrez	42b7c0cced	fixed asset.order method behavior	2019-02-26 00:18:07 +01:00
Pedro Gutiérrez	a6d2ce8fde	using a SecretStore with custom config	2019-02-20 16:06:04 +01:00
Pedro Gutiérrez	407aba7450	improved Service typing	2019-02-20 16:06:04 +01:00
Pedro Gutiérrez	0a0786a835	be able to use a SecretStore URL defined on the DDO ocean#247	2019-02-20 16:06:04 +01:00
Pedro Gutiérrez	f5ab0e6d05	improved way that is exported Service type	2019-02-20 16:06:04 +01:00
Pedro Gutiérrez	3e50ded2e5	allowing to add new services in the DDO when an asset is created	2019-02-20 16:06:04 +01:00
Pedro Gutiérrez	8fb465fc5b	improved Service definition	2019-02-20 16:06:04 +01:00
Pedro Gutiérrez	879921ec0a	linter fixes	2019-02-14 12:05:31 +01:00
Pedro Gutiérrez	cfda1e6130	added all necessary methods of Ocean.agreements	2019-02-14 12:05:31 +01:00
Pedro Gutiérrez	05efcc3ff1	added created attribute on DDO	2019-02-14 12:05:31 +01:00
Pedro Gutiérrez	2d4cd891b3	changed returning data of asset.create	2019-02-14 12:05:31 +01:00
Pedro Gutiérrez	14f3955ed0	added Search asset tests	2019-02-14 12:05:31 +01:00
Pedro Gutiérrez	8bce68a3a5	added test of registration of service agreement templates	2019-02-14 12:05:31 +01:00
Pedro Gutiérrez	e1b9197746	added buy asset test	2019-02-14 12:05:31 +01:00
Pedro Gutiérrez	e46ef174a2	initial integration test scaffolding	2019-02-14 12:05:31 +01:00
Pedro Gutiérrez	3cf578cfae	using spree for running examples	2019-02-08 17:37:21 +01:00
Pedro Gutiérrez	34745f3b66	small changes	2019-02-08 17:37:21 +01:00
Pedro Gutiérrez	c56989a710	using files intead of contentUrls on examples ocean#251	2019-02-08 17:37:21 +01:00
Pedro Gutiérrez	e88a40dac0	replaces contentUrls by files on DDO ocean#251	2019-02-08 17:37:21 +01:00
Pedro Gutiérrez	1336773272	moved checksum length control	2019-02-08 17:37:21 +01:00
Pedro Gutiérrez	d51e3f3dbf	updated registerAttribute method	2019-02-08 17:37:21 +01:00
Pedro Gutiérrez	51cae44be9	using account password from env variable	2019-02-08 17:37:21 +01:00
Pedro Gutiérrez	f82b99792f	linter fixes	2019-02-08 17:37:21 +01:00
Pedro Gutiérrez	749e77cf53	fixed on imports	2019-02-08 17:37:21 +01:00
Pedro Gutiérrez	f557fccd29	apply changes on examples	2019-02-08 17:37:21 +01:00
Pedro Gutiérrez	c24aea4bda	adding proof and checksum on asset creation flow	2019-02-08 17:37:21 +01:00
Pedro Gutiérrez	d365650a7a	implemented proof generator on DDO	2019-02-08 17:37:21 +01:00
Pedro Gutiérrez	494b9e7d1b	added helpers to sign and verify the web3 personal signatures	2019-02-08 17:37:21 +01:00
Pedro Gutiérrez	518a784554	improved exportation of typings related to DDOs	2019-02-08 17:37:21 +01:00
Pedro Gutiérrez	5694ae29b5	changed some methods	2019-02-08 17:37:21 +01:00
Pedro Gutiérrez	26e6c534a0	fixed part of the unit test	2019-02-08 17:37:21 +01:00
Pedro Gutiérrez	0599ba67fa	updated setupTemplate method	2019-02-08 17:37:21 +01:00
Pedro Gutiérrez	3364feb9dd	removed Auth contract	2019-02-08 17:37:21 +01:00
Pedro Gutiérrez	fc46592fe9	replaced OceanMarket with Dispenser	2019-02-08 17:37:21 +01:00
Pedro Gutiérrez	64921829f9	changed name of ServiceExecutionAgreement	2019-02-08 17:37:21 +01:00
Pedro Gutiérrez	95a98daa38	moved main methods to modules by scope	2019-01-25 21:23:37 +01:00
Pedro Gutiérrez	380f665256	skipped some integration test are not consistent (temporal)	2019-01-25 16:06:18 +01:00
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	c1c3168c64	improved error detection on integration test #118	2019-01-24 10:48:48 +01:00
Pedro Gutiérrez	83cf56b57e	fixed error related to asset consuming #114	2019-01-24 10:48:48 +01:00
Pedro Gutiérrez	1ecbb69937	improved error detection on http requests #118	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	5e4a33f4e2	added better DID verification	2019-01-22 14:14:49 +01:00
Pedro Gutiérrez	ff7dc04d28	using a random account (of a list) to run the integration test #107	2019-01-16 13:55:02 +01:00
Pedro Gutiérrez	b6713bfc81	use Barge to run integration tests	2019-01-15 16:09:31 +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
Pedro Gutiérrez	4074d95f1e	added comments on some internal classes #79	2019-01-09 16:39:18 +01:00
Pedro Gutiérrez	b2d2271e50	added comment documentation on DDO related classes #79	2019-01-09 16:39:18 +01:00
Sebastian Gerske	b1df2513e2	cleaned packages ... updated to web3 1.0 beta 37	2018-12-19 09:00:35 +01:00
Sebastian Gerske	724a29ee80	add detection for meta mask	2018-12-18 15:50:37 +01:00
diminator	800850e288	expose DID and IdGenerator	2018-12-17 22:41:47 +01:00
diminator	e9e1266712	Merge branch 'develop' of github.com:oceanprotocol/squid-js into develop	2018-12-17 18:55:33 +01:00
diminator	53610ed599	Merge branch 'develop' of github.com:oceanprotocol/squid-js into develop	2018-12-17 18:54:34 +01:00
diminator	487d259d1e	merge	2018-12-17 18:46:29 +01:00
Dimitri De Jonghe	3bd8c75db8	Merge branch 'develop' into fix/circular_dep	2018-12-17 18:44:05 +01:00
Jernej Pregelj	e953180700	lint fixes	2018-12-17 17:43:45 +01:00
Sebastian Gerske	dea6ea4770	fix/circular_dep	2018-12-17 17:37:36 +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	62c3e77b44	Merge branch 'develop' into feature/export-eventlistener	2018-12-17 11:23:56 +01:00
diminator	d73df95563	export EventListener	2018-12-15 15:25:57 +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
Sebastian Gerske	85496f7002	added the check for the status of the template that is used to sign the service agreement	2018-12-14 16:11:26 +01:00
ssallam	c2f77295ce	Fix tests.	2018-12-14 14:07:41 +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
ssallam	968583e2dd	Fix brizo purchaseEndpoint.	2018-12-12 20:52:11 +01:00
Sebastian Gerske	b2cebf7748	added verbose flag to config	2018-12-11 17:41:10 +01:00
Sebastian Gerske	ce009dcd94	remove fs because it does not work in the browser	2018-12-10 13:26:33 +01:00
Sebastian Gerske	83ce375588	remove dead code	2018-12-10 13:26:07 +01:00
Sebastian Gerske	8c4813b908	added hdwallet support to examples	2018-12-10 10:11:36 +01:00
ssallam	4f05e3f455	fix saving downloaded file.	2018-12-10 00:15:40 +01:00
Sebastian Gerske	5a1016d1fb	fixed codacy	2018-12-08 21:51:37 +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	7b0d34a420	hardened event listening	2018-12-07 17:19:53 +01:00
Sebastian Gerske	8ab5f7408b	remove logging	2018-12-07 17:19:16 +01:00
Sebastian Gerske	2310c7103e	increase timeout	2018-12-07 16:55:32 +01:00
Sebastian Gerske	0f262f5f03	map events properly	2018-12-07 16:00:33 +01:00
Sebastian Gerske	2c85460285	fix timeout	2018-12-07 15:30:54 +01:00
Sebastian Gerske	382207b904	fix registering	2018-12-07 15:23:17 +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	9ebe43510f	added logging of brizo args	2018-11-29 08:45:10 +01:00
Sebastian Gerske	f65bb4e050	added support for poa mainnet (core) and testnet (sokol)	2018-11-29 08:44:58 +01:00
Sebastian Gerske	9cd134052c	example for adding hdwallet	2018-11-28 13:54:37 +01:00
Sebastian Gerske	8d2b9c62f2	fix fire lazers	2018-11-27 13:38:18 +01:00
Sebastian Gerske	0981289745	changed formatting	2018-11-27 12:27:15 +01:00
Sebastian Gerske	79281c4f98	Merge remote-tracking branch 'origin/develop' into feature/trilobite_countdown ... # Conflicts: # package.json	2018-11-27 09:02:08 +01:00
Jernej Pregelj	7f3b4b1f48	webpack package builder	2018-11-26 15:55:09 +01:00
Sebastian Gerske	43a5e53d57	fix brizo connection	2018-11-26 15:24:59 +01:00
Sebastian Gerske	2201ebb997	fix samples	2018-11-23 17:05:44 +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	07455e84a9	Merge branch 'develop' into feature/trilobite_countdown	2018-11-23 15:53:34 +01:00
Sebastian Gerske	695825c50b	fix unsubscribe	2018-11-23 14:54:22 +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
diminator	faf974d03b	Merge remote-tracking branch 'remotes/origin/develop' into deploy/es-cjs-umd-min-builds	2018-11-23 12:57:07 +01:00
Sebastian Gerske	9503419b0e	added more functionality to event listener	2018-11-23 12:40:49 +01:00
Sebastian Gerske	1b967896df	small ddo adoptions	2018-11-23 12:40:18 +01:00
Sebastian Gerske	f37a1cc1c6	make event listener static	2018-11-23 11:47:39 +01:00
Sebastian Gerske	df475b6958	added event listener	2018-11-23 11:39:16 +01:00
Sebastian Gerske	375f153b93	add detection for local poa	2018-11-23 09:57:37 +01:00
Sebastian Gerske	43db4412ee	add events to template	2018-11-23 09:57:26 +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	a6c09d0f88	fix lock Payment	2018-11-22 13:14:38 +01:00
Sebastian Gerske	2d41535bab	remove logs	2018-11-22 11:39:20 +01:00
Sebastian Gerske	42959d8fc7	fix compressed deps	2018-11-22 11:38:00 +01:00
Sebastian Gerske	8a68715fce	getting closer to compressed deps	2018-11-22 11:32:06 +01:00
Sebastian Gerske	8390c12599	fix shifting	2018-11-22 10:58:24 +01:00
Sebastian Gerske	920ae0dc35	added more logging	2018-11-22 10:56:06 +01:00
Sebastian Gerske	43fe8634d2	fix lockPayment	2018-11-22 09:22:27 +01:00
Sebastian Gerske	e4bd6ea84f	refactor api path	2018-11-21 16:47:24 +01:00