Miquel A. Cabot
|
580dce734f
|
Merge branch 'v4main' into issue-1351-rewrite-fixedrateexchange-test
|
2022-05-24 09:34:17 +02:00 |
|
Miquel A. Cabot
|
1ef7aa7027
|
Merge pull request #1377 from oceanprotocol/issue-1346-rewrite-datatoken-test
Issue-#1346: Rewrite Datatoken test
|
2022-05-24 09:32:55 +02:00 |
|
Miquel A. Cabot
|
21b69520ef
|
Merge branch 'v4main' into issue-1352-rewrite-sidestaking-test
|
2022-05-24 09:32:28 +02:00 |
|
Miquel A. Cabot
|
5884aef630
|
Merge pull request #1412 from oceanprotocol/issue-1350-rewrite-dispenser-test
Issue-#1350: Rewrite Dispenser test
|
2022-05-24 09:31:06 +02:00 |
|
Miquel A. Cabot
|
eea1c374b3
|
Merge branch 'v4main' into issue-1346-rewrite-datatoken-test
|
2022-05-23 16:51:29 +02:00 |
|
Miquel A. Cabot
|
27ce27b5b4
|
Merge pull request #1369 from oceanprotocol/issue-1347-rewrite-nft-test
Issue-#1347: Rewrite Nft test
|
2022-05-23 16:46:26 +02:00 |
|
Miquel A. Cabot
|
21d6d43ab3
|
initialize accounts with null
|
2022-05-23 15:55:38 +02:00 |
|
Miquel A. Cabot
|
623238882e
|
initialize accounts with null
|
2022-05-23 15:55:07 +02:00 |
|
Miquel A. Cabot
|
d77966a646
|
initialize accounts with null
|
2022-05-23 15:54:21 +02:00 |
|
Miquel A. Cabot
|
71d49ec230
|
initialize accounts with null
|
2022-05-23 15:53:47 +02:00 |
|
Miquel A. Cabot
|
00e2a68918
|
initialize owner with null
|
2022-05-23 15:52:56 +02:00 |
|
Miquel A. Cabot
|
7f1401ae9f
|
initialize owner with null
|
2022-05-23 15:43:39 +02:00 |
|
Jamie Hewitt
|
4b9f6c9c00
|
Checking if the caller is Publishing Market Fee Address before calling the smart contract
|
2022-05-18 17:01:05 +03:00 |
|
Jamie Hewitt
|
9070b61111
|
Merge branch 'v4main' of github.com:oceanprotocol/ocean.js into issue-1335-setPublishingMarketFee-function
|
2022-05-18 16:06:41 +03:00 |
|
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
|
f13850a0a8
|
fix getvestingAmount error
|
2022-05-17 18:21:20 +02:00 |
|
Miquel A. Cabot
|
2ccc35819f
|
fix calculation error
|
2022-05-17 18:07:20 +02:00 |
|
Miquel A. Cabot
|
d3a9296bcc
|
Merge branch 'v4main' into issue-1352-rewrite-sidestaking-test
|
2022-05-17 13:35:20 +02:00 |
|
Miquel A. Cabot
|
fff1b897cf
|
Merge branch 'v4main' into issue-1342-rewrite-publish-flow-test
|
2022-05-17 13:34:51 +02: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
|
fd0ff1c173
|
Merge branch 'v4main' into issue-1350-rewrite-dispenser-test
|
2022-05-17 13:34:16 +02:00 |
|
Miquel A. Cabot
|
2ff2a21809
|
Merge branch 'v4main' into issue-1349-rewrite-pool-test
|
2022-05-17 12:26:14 +02:00 |
|
Miquel A. Cabot
|
129705ac7f
|
Merge branch 'v4main' into issue-1351-rewrite-fixedrateexchange-test
|
2022-05-17 12:25:55 +02:00 |
|
Miquel A. Cabot
|
a5fc11365b
|
Merge branch 'v4main' into issue-1346-rewrite-datatoken-test
|
2022-05-17 11:50:26 +02:00 |
|
Miquel A. Cabot
|
7c093d1535
|
Merge branch 'v4main' into issue-1347-rewrite-nft-test
|
2022-05-17 11:48:51 +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
|
1e3e36d000
|
fix linting errors
|
2022-05-12 17:56:23 +02: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 |
|
Miquel A. Cabot
|
9ec4b081d7
|
Merge branch 'v4main' into issue-1350-rewrite-dispenser-test
|
2022-05-12 17:53:51 +02:00 |
|
Miquel A. Cabot
|
575cd37e33
|
Merge branch 'v4main' into issue-1352-rewrite-sidestaking-test
|
2022-05-12 17:52:52 +02:00 |
|
Miquel A. Cabot
|
b3f3551f83
|
Merge branch 'v4main' into issue-1349-rewrite-pool-test
|
2022-05-12 17:51:06 +02:00 |
|
Miquel A. Cabot
|
d8b58af57f
|
Merge branch 'v4main' into issue-1346-rewrite-datatoken-test
|
2022-05-12 17:47:05 +02:00 |
|
Miquel A. Cabot
|
032d671911
|
Merge branch 'v4main' into issue-1347-rewrite-nft-test
|
2022-05-12 17:43:16 +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
|
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 |
|