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,291 Commits 29 Branches 241 Tags
Commit Graph

2291 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
f23d47a4fd Merge branch 'v4main' into issue-1356-rewrite-testcontracthandler-helper-class 2022-03-28 15:08:33 +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
dependabot[bot]
e328e3be61
Bump @types/node from 17.0.22 to 17.0.23 (#1366) 
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 17.0.22 to 17.0.23.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  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:32 +00:00
Miquel A. Cabot
c914ca3d37 Merge branch 'issue-1356-rewrite-testcontracthandler-helper-class' into issue-1348-rewrite-nftfactory-test 2022-03-24 16:17:16 +01:00
Miquel A. Cabot
159270889e Merge branch 'v4main' into issue-1356-rewrite-testcontracthandler-helper-class 2022-03-24 16:14:02 +01:00
Miquel A. Cabot
52c8121b82
Merge pull request #1355 from oceanprotocol/issue-1292-fix-compute-test-timeout 
Issue-#1246: Use confighelper instead of hardcoded endpoints
 2022-03-24 16:06:40 +01:00
Matthias Kretschmann
296a94be98
solve all typing warnings (#1364) 2022-03-24 13:33:03 +00:00
Miquel A. Cabot
71e21f56e4 put constants inside test function 2022-03-24 12:45:37 +01:00
Miquel A. Cabot
adb8138e89 refactor script names in package.json 2022-03-24 12:29:24 +01:00
Miquel A. Cabot
db4d22b5bb check correct allowance amount 2022-03-24 11:09:07 +01:00
Miquel A. Cabot
b403471031 Merge branch 'issue-1367-fix-disableTokenTemplate-and-reactivateTokenTemplate-errors' into issue-1348-rewrite-nftfactory-test 2022-03-24 10:32:31 +01:00
Miquel A. Cabot
0e876edadf fix error in NftFactory.disableTokenTemplate() and NftFactory.reactivateTokenTemplate() 2022-03-24 09:55:27 +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