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

495 Commits

Author SHA1 Message Date
Miquel A. Cabot
c7c83e9f18 fix freParams const issue 2022-04-28 17:25:33 +02:00
Miquel A. Cabot
6f81a5ce3a Merge branch 'v4main' into issue-1346-rewrite-datatoken-test 2022-04-28 17:12:30 +02:00
Miquel A. Cabot
227ea14738 simplify constants 2022-04-28 17:12:25 +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
Miquel A. Cabot
3431212515 fix merge error 2022-04-19 14:51:38 +02:00
Miquel A. Cabot
258b2d6ecc
Merge branch 'v4main' into issue-1346-rewrite-datatoken-test 2022-04-19 11:09:04 +02:00
Miquel A. Cabot
8686f53f6c test datatoken.transfer() function 2022-04-18 18:37:36 +02:00
Miquel A. Cabot
3c38fa9eb2 test datatoken.getDecimals() function 2022-04-18 17:48:30 +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
d73790d775 uncomment assert 2022-04-13 16:13:02 +02:00
Miquel A. Cabot
32b713a35b Merge branch 'v4main' into issue-1346-rewrite-datatoken-test 2022-04-12 09:48:30 +02:00
Miquel A. Cabot
8f6de3632b fix freParams initialization error 2022-04-08 08:38:06 +02:00
Miquel A. Cabot
7a6e8f42b5 convert freParams to variable 2022-04-07 20:55:19 +02:00
Miquel A. Cabot
508e1379bc refactor ercparams constant 2022-04-07 20:52:04 +02:00
Miquel A. Cabot
e2df76fb90 refeactor freCreationParams constant 2022-04-07 20:46:27 +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
f4ea396e28 Merge branch 'v4main' into issue-1346-rewrite-datatoken-test 2022-04-06 17:18:17 +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
Miquel A. Cabot
b6894100a8 use balance() function from library 2022-03-30 12:43:44 +02:00
Miquel A. Cabot
a6ce3002be refactor ERC20 constants 2022-03-30 12:29:35 +02:00
Miquel A. Cabot
9eb88f47c6 remove unused approve method 2022-03-30 12:26:13 +02:00
Miquel A. Cabot
d3f9edc1bd remove unused variables 2022-03-30 12:13:35 +02:00
Miquel A. Cabot
8ec9d65cb9 refactor constants 2022-03-30 10:12:35 +02:00
Miquel A. Cabot
ba2d1e5fe7 assert that all needed exceptions are thrown 2022-03-30 10:08:06 +02:00
Miquel A. Cabot
623261d548 Merge branch 'issue-1356-rewrite-testcontracthandler-helper-class' into issue-1346-rewrite-datatoken-test 2022-03-29 23:13:02 +02:00
Miquel A. Cabot
12eb0aebc2 fix merge errors 2022-03-29 22:41:20 +02:00
Miquel A. Cabot
736cf2e736 Merge branch 'v4main' into issue-1356-rewrite-testcontracthandler-helper-class 2022-03-29 22:30:51 +02:00
mihaisc
776a50a515
comment broken tests (#1379)
* comment broken tests

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* comment broken tests

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* comment broken tests

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* comment broken tests

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* comment broken tests

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2022-03-29 19:58:59 +03:00
Miquel A. Cabot
1b426a2098 remove an unnecessary aprove statement 2022-03-29 18:15:06 +02:00
Miquel A. Cabot
feda473f26 don't import abis from contracts in tests 2022-03-29 18:10:33 +02:00
Miquel A. Cabot
4a96021cc4 refactor constants 2022-03-29 18:10:16 +02:00
Soon Huat
4c5da01d66
change address[1] to paymentCollector based on smart contract (#1375)
Co-authored-by: Soon Huat <soon_huat.phan@daimler.com>
2022-03-29 15:40:30 +01:00
Bogdan Fazakas
4157e1e473
update compute status query and jsdoc (#1361) 2022-03-29 15:40:01 +01:00
Miquel A. Cabot
a33bf42452
Issue-#1367: Fix error in NftFactory.disableTokenTemplate() and NftFactory.reactivateTokenTemplate() (#1368)
* fix error in NftFactory.disableTokenTemplate() and NftFactory.reactivateTokenTemplate()

* add tests for nft and token templates
2022-03-29 15:37:50 +01:00
Miquel A. Cabot
319bad47e7 refactor constants 2022-03-29 15:01:36 +02:00
Miquel A. Cabot
16b83f0088 fix error in should deploy contracts Pool test 2022-03-28 15:19:51 +02:00
Miquel A. Cabot
1bd82e7f3a Fix error "Cannot read properties of undefined (reading 'sideStakingAddress')" 2022-03-22 17:58:49 +01:00
Miquel A. Cabot
d60c26be50 Merge branch 'issue-1292-fix-compute-test-timeout' into issue-1356-rewrite-testcontracthandler-helper-class 2022-03-22 16:22:07 +01:00