1
0
mirror of https://github.com/oceanprotocol/ocean.js.git synced 2024-11-26 20:39:05 +01:00

519 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Jamie Hewitt
8c9e46a8dd Adding estimate gas method and fixing tests 2022-04-21 15:14:32 +02:00
Jamie Hewitt
4eefc083e2 Updating user addresses 2022-04-21 12:58:31 +02:00
Jamie Hewitt
a81cdddc30 Updating tests 2022-04-21 12:48:28 +02:00
Jamie Hewitt
74f4642ad0 Adding additional assert statements 2022-04-21 12:22:31 +02:00
Jamie Hewitt
d996625809 Updating assert statements 2022-04-21 11:47:47 +02:00
Jamie Hewitt
5cedb37d80 Adding additional assert to tests 2022-04-21 11:18:45 +02:00
Jamie Hewitt
257d1aeeea Adding extra test 2022-04-20 16:44:15 +02:00
Bogdan Fazakas
f96ccb0c56
Add reuseOrder method (#1421)
* added reuseOrder method

* wip add test to reuseOrder

* update test

* check also ProviderFee event
2022-04-20 16:42:07 +03:00
Jamie Hewitt
ee90d58cde Fix linting 2022-04-20 15:24:33 +02:00
Jamie Hewitt
44db9db5a4 Writting tests for setPublishingMarketFee 2022-04-20 14:42:51 +02:00
Bogdan Fazakas
ec601a66d2
Fix get compute results (#1386)
* wip special chars

* clean ups

* update sha256 import from cryptojs lib

* update compute result and use alpha-26 contracts

* re-build with package-lock v1 and with dist

* ignore build files from dist

* delete build files

* removed console logs and updated ComputeResultType typing

* update compute integration test

* added more tests

* added some logs

* update file download method

* use fetch data

* remove download part

* delete console logs

* review fixes

* more fixes

Co-authored-by: Soon Huat <soon_huat.phan@daimler.com>
2022-04-14 23:58:25 +01:00
Soon Huat
628c2fc1fc
setPaymentCollector apply same checking as contract (#1396)
* setPaymentCollector apply same checking as contract

* unit test for setPaymentCollector for owner and erc20 deployer

* setPaymentCollector amend redundent truth check on boolean value

Co-authored-by: Soon Huat <soon_huat.phan@daimler.com>
2022-04-14 15:43:01 +01:00
Miquel A. Cabot
962340b0db Merge branch 'v4main' into issue-1348-rewrite-nftfactory-test 2022-04-12 09:47:57 +02:00
Miquel A. Cabot
508e1379bc refactor ercparams constant 2022-04-07 20:52:04 +02:00
Miquel A. Cabot
3e2efc0ef6 refactor ercParams const 2022-04-07 20:43:00 +02:00
Miquel A. Cabot
ecaf7ec30e Merge branch 'v4main' into issue-1353-rewrite-router-test 2022-04-06 17:20:00 +02:00
Miquel A. Cabot
4e1a79ac21 solve problem with NftCreateData constant 2022-04-06 17:03:50 +02:00
Miquel A. Cabot
050edc4081 Merge branch 'v4main' into issue-1348-rewrite-nftfactory-test 2022-04-06 16:42:54 +02:00
Alex Coseru
005c2d9760
Feature/bump contracts to alpha 28 (#1392)
* bump contracts to alpha 28
2022-04-04 14:56:41 +03:00
Miquel A. Cabot
1aa678ed4d standarize DAI amount 2022-04-03 09:08:29 +02:00
Miquel A. Cabot
fb937cdd21 fix assert error in Pool 2022-04-03 09:07:34 +02:00
Miquel A. Cabot
bbbc64fb5e fix lint errors 2022-03-31 23:44:52 +02:00
Miquel A. Cabot
08552eb446 refactor constants 2022-03-31 23:43:32 +02:00
Miquel A. Cabot
0ecc973e08 refactor pool and erc creation params 2022-03-31 23:32:17 +02:00
Miquel A. Cabot
ae84833053 use approve() method from utils 2022-03-31 23:24:49 +02:00
Miquel A. Cabot
edc4e83e58 fix lint errors 2022-03-31 23:13:39 +02:00
Miquel A. Cabot
73c4647783 refactor constants 2022-03-31 23:10:46 +02:00
Miquel A. Cabot
a2964d4a30 use balance() function from library and don't use imported abis 2022-03-31 23:05:03 +02:00
Miquel A. Cabot
8f84b85a42 Revert "remove unused approve method"
This reverts commit 9eb88f47c68b1f6206857d59feaf70d26ddce177.
2022-03-31 21:51:48 +02:00
Miquel A. Cabot
9ff8b977e6 Revert "use balance() function from library"
This reverts commit b6894100a820e603273594b311f9fd37af3a5404.
2022-03-31 21:51:30 +02:00