274 Commits

Author	SHA1	Message	Date
Miquel A. Cabot	83b8d1dce3	general renaming in FixedRateExchange	2022-06-14 10:52:51 +02:00
Miquel A. Cabot	ba8ea90a20	rename createNftErc20WithDispenser to createNftWithDatatokenWithDispenser	2022-06-10 11:32:58 +02:00
Miquel A. Cabot	77fcfe94f5	rename createNftErc20WithFixedRate to createNftWithDatatokenWithFixedRate	2022-06-10 11:30:22 +02:00
Miquel A. Cabot	4d56ca2e9e	rename createNftErc20WithPool to createNftWithDatatokenWithPool	2022-06-10 11:28:55 +02:00
Miquel A. Cabot	2adb54c4eb	rename createNftWithErc20 to createNftWithDatatoken	2022-06-10 11:26:53 +02:00
Miquel A. Cabot	29c581fde2	rename from erc20 to nft in comments	2022-06-10 11:19:08 +02:00
Miquel A. Cabot	71390cf862	rename erc20Params to datatokenParams	2022-06-10 10:56:40 +02:00
Miquel A. Cabot	6287005473	rename Erc20CreateParams to DatatokenCreateParams	2022-06-10 10:54:51 +02:00
Miquel A. Cabot	e49d957022	change erc721Address to nftAddress	2022-06-10 10:14:37 +02:00
Miquel A. Cabot	2c8832e22c	inherit FixedRateExchange from SmartContract	2022-06-06 17:43:39 +02:00
Miquel A. Cabot	d12b669f65	fix Dispenser tests	2022-06-06 17:37:17 +02:00
Miquel A. Cabot	4515f938e2	revert console log to find issue	2022-06-06 17:29:24 +02:00
Miquel A. Cabot	7d21fc195b	console log to find issue	2022-06-06 17:16:30 +02:00
Miquel A. Cabot	13e66b1fae	console log to find issue	2022-06-06 17:02:04 +02:00
Miquel A. Cabot	8f3635ee61	revert console log to find issue	2022-06-06 16:23:01 +02:00
Miquel A. Cabot	d065a778f4	console log to find issue	2022-06-06 15:05:01 +02:00
Miquel A. Cabot	1d92f06108	console log to find issue	2022-06-06 14:49:46 +02:00
Jamie Hewitt	87edac976f	Merge pull request #1438 from oceanprotocol/issue-1437-marketplace-flow-integration-test-for-v4 ... Creating code examples file + updates to readme	2022-06-01 14:38:37 +01:00
Miquel A. Cabot	9e3a945753	Merge pull request #1460 from oceanprotocol/issue-1342-rewrite-publish-flow-test ... Issue-#1342: Rewrite publish flow test	2022-05-30 15:16:12 +02:00
Miquel A. Cabot	ba34fa7627	use the new transfer() function	2022-05-26 12:43:31 +02:00
Jamie Hewitt	b2ac1576ce	Adding editing instructions	2022-05-18 14:08:02 +03: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	a7ff5df3a3	Merge branch 'v4main' into issue-1342-rewrite-publish-flow-test	2022-05-12 17:54:27 +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
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	10f1f30b9c	await for approving allowance function	2022-05-06 11:26:01 +02: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	3864c07b8b	refactor PublishFlows.test	2022-05-06 11:11:47 +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
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
Miquel A. Cabot	e70a81d756	publish a dataset (create NFT + Datatoken) with a fixed rate exchange	2022-04-29 10:23:16 +02:00