550 Commits

Author	SHA1	Message	Date
Jamie Hewitt	b2ac1576ce	Adding editing instructions	2022-05-18 14:08:02 +03:00
Jamie Hewitt	4c72799bef	Merge branch 'v4main' into issue-1437-marketplace-flow-integration-test-for-v4	2022-05-18 13:04:49 +03:00
Miquel A. Cabot	c4ee9bc7f4	Merge pull request #1362 from oceanprotocol/issue-1348-rewrite-nftfactory-test ... Issue-#1348 rewrite NftFactory test	2022-05-18 11:57:58 +02:00
Jamie Hewitt	868de7c178	fixing linting & solving conflict	2022-05-18 11:47:02 +03:00
Jamie Hewitt	5716a904e0	Pull from origin v4main	2022-05-18 10:57:34 +03:00
Miquel A. Cabot	2c19258782	Merge branch 'v4main' into issue-1343-rewrite-simple-publish-consume-flow-test	2022-05-17 13:34:38 +02:00
Miquel A. Cabot	110368729f	Merge branch 'v4main' into issue-1348-rewrite-nftfactory-test	2022-05-17 11:48:25 +02:00
Alex Coseru	bf060948a8	bump contracts to alpha.33 (#1472) ... * bump contracts * remove getOPCCollector	2022-05-17 12:04:51 +03:00
Miquel A. Cabot	4cfc5ad567	Use transfer() and approve() functions	2022-05-16 17:48:35 +02:00
Miquel A. Cabot	607d894de3	Merge branch 'v4main' into issue-1343-rewrite-simple-publish-consume-flow-test	2022-05-12 17:54:12 +02:00
Miquel A. Cabot	0cb8841e39	Merge branch 'v4main' into issue-1348-rewrite-nftfactory-test	2022-05-12 17:40:03 +02:00
Alex Coseru	6d9f9fed92	simple compute flow (#1458) ... * refactor compute flow	2022-05-10 08:52:24 +03:00
Miquel A. Cabot	f9a8c0a784	fix lint problems	2022-05-09 11:29:45 +02:00
Miquel A. Cabot	55fec840c3	get addresses from config file instead of deploying it	2022-05-09 11:19:34 +02:00
Miquel A. Cabot	1749b0d989	update call to Dispenser constructor	2022-05-09 09:01:05 +02:00
Miquel A. Cabot	6930449ae8	Merge branch 'v4main' into issue-1437-marketplace-flow-integration-test-for-v4	2022-05-09 08:58:14 +02:00
Jamie Hewitt	2893d77952	Merge branch 'issue-1437-marketplace-flow-integration-test-for-v4' of github.com:oceanprotocol/ocean.js into issue-1437-marketplace-flow-integration-test-for-v4	2022-05-06 16:04:45 +03:00
Jamie Hewitt	4968d2d63d	Updating comments and numbering	2022-05-06 16:04:30 +03:00
Miquel A. Cabot	287082e1f7	add DDO type	2022-05-06 11:15:17 +02:00
Miquel A. Cabot	11508b7794	add DDO type	2022-05-06 11:14:39 +02:00
Miquel A. Cabot	a75ca34e9e	don't deploy smart contracts	2022-05-06 10:43:44 +02:00
Jamie Hewitt	d39c091999	Updating comments	2022-05-05 17:35:06 +03:00
Jamie Hewitt	75e0afa4d9	Adding additional comments in the code	2022-05-05 16:47:38 +03:00
Jamie Hewitt	0e4df185b1	Addign links	2022-05-05 16:27:57 +03:00
Jamie Hewitt	dd74300477	Merging changes from issue-1354-readme-integration-tests	2022-05-05 16:14:03 +03:00
Miquel A. Cabot	c97f750313	refactor SimplePublishConsumeFlow.test.ts file	2022-05-05 13:39:41 +02:00
Miquel A. Cabot	b40f52d6a6	add assertion	2022-05-04 18:25:12 +02:00
Miquel A. Cabot	997bbf57b4	test getComputeEnvironments()	2022-05-04 18:13:36 +02:00
Jamie Hewitt	92a3d81353	Additional text	2022-05-03 17:19:39 +03:00
mihaisc	1b93d86df5	fix test ... Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>	2022-05-03 13:32:43 +03:00
mihaisc	60ffa8b271	fix test ... Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>	2022-05-03 13:27:05 +03:00
Miquel A. Cabot	6471550ae5	add necessary comments	2022-05-02 23:01:00 +02:00
Miquel A. Cabot	3a757043f5	rename liquidityAccount to stakerAccount	2022-05-02 22:23:52 +02:00
Miquel A. Cabot	b7e305fa98	dispense flox in marketplace test	2022-05-02 12:17:31 +02:00
Miquel A. Cabot	86005ba091	publish and consume fixed rate exchange data asset	2022-05-01 14:46:13 +02:00
Alex Coseru	77fe186949	bump to contracts alpha 31 (#1448) ... * bump to contracts alpha 31	2022-04-29 16:25:42 +03:00
Miquel A. Cabot	e70a81d756	publish a dataset (create NFT + Datatoken) with a fixed rate exchange	2022-04-29 10:23:16 +02:00
Miquel A. Cabot	7e4ca995f8	refactor variable names	2022-04-28 23:47:14 +02:00
Miquel A. Cabot	41c7a34fa5	rename nft and datatoken variables	2022-04-28 23:40:33 +02:00
Miquel A. Cabot	978fc0bc5d	user should add liquidity to the pool, receiving LP tokens	2022-04-28 23:35:53 +02:00
Miquel A. Cabot	f7cfc5e6a8	send some OCEAN to consumer account	2022-04-28 23:12:28 +02:00
Miquel A. Cabot	f2e96e1d96	Merge branch 'v4main' into issue-1348-rewrite-nftfactory-test	2022-04-28 17:01:52 +02:00
Miquel A. Cabot	26e1cba7cb	simplify constants	2022-04-28 16:50:00 +02:00
Miquel A. Cabot	7354814f49	fix consumer address	2022-04-28 09:37:39 +02:00
Miquel A. Cabot	8060ad683b	fix OCEAN address	2022-04-28 09:29:01 +02:00
Miquel A. Cabot	7bb77d6443	fix lint issues	2022-04-28 09:18:28 +02:00
Miquel A. Cabot	8e1e3ec06b	send OCEAN tokens to consumer account	2022-04-28 09:16:19 +02:00
Miquel A. Cabot	431808777c	add markdown comments	2022-04-28 09:10:19 +02:00
Miquel A. Cabot	06c1046943	update provider url	2022-04-28 08:53:03 +02:00
Miquel A. Cabot	77db0f7e9f	add markdown documentation comments	2022-04-27 17:57:21 +02:00