oceanprotocol/ocean.js
1
0
Fork 0
mirror of https://github.com/oceanprotocol/ocean.js.git synced 2024-11-26 20:39:05 +01:00
Code Releases Activity
2,566 Commits 29 Branches 241 Tags
Commit Graph

2566 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
2de5418899 Merge branch 'v4main' into issue-1353-rewrite-router-test 2022-03-30 18:51:11 +02:00
Miquel A. Cabot
2e244cc707 Merge branch 'v4main' into issue-1346-rewrite-datatoken-test 2022-03-30 18:50:02 +02:00
Miquel A. Cabot
444d7257da Merge branch 'v4main' into issue-1347-rewrite-nft-test 2022-03-30 18:49:00 +02:00
Miquel A. Cabot
9e5c95d88b Merge branch 'v4main' into issue-1348-rewrite-nftfactory-test 2022-03-30 18:48:13 +02:00
Miquel A. Cabot
f1e9de361d
Merge pull request #1357 from oceanprotocol/issue-1356-rewrite-testcontracthandler-helper-class 
Issue-#1356 rewrite testcontracthandler helper class
 2022-03-30 18:45:18 +02:00
Miquel A. Cabot
e49a94c0cb remove abi import 2022-03-30 17:36:54 +02:00
Miquel A. Cabot
f1fd537430 remove abi import 2022-03-30 17:33:51 +02:00
Miquel A. Cabot
5766f87427 revert package-lock to v4main version 2022-03-30 17:12:59 +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
dependabot[bot]
eaf463cd45
Bump @oceanprotocol/contracts from 1.0.0-alpha.26 to 1.0.0-alpha.27 (#1381) 
Bumps [@oceanprotocol/contracts](https://github.com/oceanprotocol/contracts) from 1.0.0-alpha.26 to 1.0.0-alpha.27.
- [Release notes](https://github.com/oceanprotocol/contracts/releases)
- [Commits](https://github.com/oceanprotocol/contracts/compare/v1.0.0-alpha.26...v1.0.0-alpha.27)

---
updated-dependencies:
- dependency-name: "@oceanprotocol/contracts"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-03-30 11:18:55 +01: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
cdc293ddcc update package-lock file 2022-03-29 23:13:57 +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
3d6023d233 Merge branch 'issue-1356-rewrite-testcontracthandler-helper-class' into issue-1347-rewrite-nft-test 2022-03-29 23:02:55 +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
a4344580ed update package-lock file 2022-03-29 22:41:30 +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
271e870b5e
Release 1.0.0-next.32 v1.0.0-next.32 2022-03-29 20:08:11 +03: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
mihaisc
76623648d2 Release 1.0.0-next.31 v1.0.0-next.31 2022-03-29 17:20:43 +03:00
mihaisc
eee596bbd6 Release 1.0.0-next.30 v1.0.0-next.30 2022-03-29 17:14:35 +03:00
Soon Huat
9106a78646
default amountToUnits decimals to 18, FRE consumerMarketSwapFee witho… (#1374) 
* default amountToUnits decimals to 18, FRE consumerMarketSwapFee without basetoken

* Revert "default amountToUnits decimals to 18, FRE consumerMarketSwapFee without basetoken"

This reverts commit 14ef599738a85d82f1268ed77a338b4ba1b9f668.

* FRE, web3 toWei for percentage based value

Co-authored-by: Soon Huat <soon_huat.phan@daimler.com>
 2022-03-29 15:54:09 +01: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
dependabot[bot]
ea9bceb092
Bump prettier from 2.6.0 to 2.6.1 (#1373) 
Bumps [prettier](https://github.com/prettier/prettier) from 2.6.0 to 2.6.1.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/2.6.0...2.6.1)

---
updated-dependencies:
- dependency-name: prettier
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-03-29 15:38:55 +01:00
dependabot[bot]
0df310596a
Bump minimist from 1.2.5 to 1.2.6 (#1370) 
Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-03-29 15:38:46 +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
mihaisc
0c65a03a69
fix typedoc (#1378) 2022-03-29 07:36:22 -07:00
Miquel A. Cabot
745647b65f upgrade to @oceanprotocol/contracts 1.0.0-alpha.27 2022-03-29 15:10:18 +02:00
Miquel A. Cabot
5580d45fd7 upgrade to @oceanprotocol/contracts 1.0.0-alpha.27 2022-03-29 15:08:00 +02: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
f23d47a4fd Merge branch 'v4main' into issue-1356-rewrite-testcontracthandler-helper-class 2022-03-28 15:08:33 +02:00
Miquel A. Cabot
1fda84251e remove unused variables 2022-03-28 13:13:22 +02:00
Miquel A. Cabot
b6bbdce723 refactor imports 2022-03-28 13:12:14 +02:00
dependabot[bot]
7837bac5c7
Bump typescript from 4.6.2 to 4.6.3 (#1371) 
Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.6.2 to 4.6.3.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](https://github.com/Microsoft/TypeScript/compare/v4.6.2...v4.6.3)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-03-25 14:20:48 +00:00