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

328 Commits

Author SHA1 Message Date
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
0cb8841e39 Merge branch 'v4main' into issue-1348-rewrite-nftfactory-test 2022-05-12 17:40:03 +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
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
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
Miquel A. Cabot
e49a94c0cb remove abi import 2022-03-30 17:36:54 +02:00
Miquel A. Cabot
b6894100a8 use balance() function from library 2022-03-30 12:43:44 +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
40e618325e Merge branch 'issue-1356-rewrite-testcontracthandler-helper-class' into issue-1348-rewrite-nftfactory-test 2022-03-29 22:53:12 +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
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
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
71e21f56e4 put constants inside test function 2022-03-24 12:45:37 +01:00
Miquel A. Cabot
db4d22b5bb check correct allowance amount 2022-03-24 11:09:07 +01:00
Miquel A. Cabot
5e9f99752c test adding disabling and reactivating templates 2022-03-23 19:19:33 +01:00
Miquel A. Cabot
ed2c725ac2 refactor comments 2022-03-23 17:11:41 +01:00
Miquel A. Cabot
c7608ea6b8 #createNftwithErc - should increment nft and token count 2022-03-23 17:11:34 +01:00
Miquel A. Cabot
054351b88a refactor nft and dt parameters 2022-03-23 16:43:20 +01:00
Miquel A. Cabot
a72c510b9e add DATA_TOKEN_AMOUNT constant 2022-03-23 15:54:38 +01:00
Miquel A. Cabot
4614833ce0 add constants 2022-03-23 15:45:58 +01:00
Miquel A. Cabot
352b52afb3 remove unused accounts 2022-03-23 13:10:45 +01:00
Miquel A. Cabot
913e8440c3 Merge branch 'issue-1356-rewrite-testcontracthandler-helper-class' into issue-1348-rewrite-nftfactory-test 2022-03-22 21:45:59 +01:00
Miquel A. Cabot
1bd82e7f3a Fix error "Cannot read properties of undefined (reading 'sideStakingAddress')" 2022-03-22 17:58:49 +01:00