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

505 Commits

Author SHA1 Message Date
paulo-ocean
995a7f0ef9 wip: add unit test 2024-09-05 14:59:16 +01:00
Alex Coseru
91460b9cf5
bump contracts & add optimism (#1786)
* bump contracts

* fix contracts

* add optimism

* use upcoming barge

* update fre tests

* make sure all fres are withMint
2023-11-24 15:12:21 +02:00
Bogdan Fazakas
faa7de3601
Feature/Add order util method (#1759)
* added order  helper method using contracts calls

* fixes consume fees  & lint

* cleanup

* update order helper method to be more generic

* fix all warnings
2023-08-25 17:33:06 +03:00
Jamie Hewitt
8699e4a8bb Adding tests to check if the number of decimals is correct for the publishMarketFee 2023-07-06 18:21:05 +03:00
Alex Coseru
9bf71ba4f0
Features/ethers (#1696)
* add ethers

* global updates

* ve updates

* ve tests

* contract updates

* first test passing

* downgrade to ethers 5.7.2

* add log

* add tx wait

* full NftFactory.test

* add wait

* add Router tests

* fix dispenser

* Nft test

* add dispenser tests

* add fre tests part 1

* WIP datatoken unit tests

* add DFRewards test

* increase gas estimate

* increase gas estimate

* Work datatoken unit tests

* datatoken test more tests

* finished datatoken tests

* fix nft get data

* fix nft transfer tests

* Provider int tests

* Updating CodeExamples.md

* update provider & fix publish flow int test

* wip publish edit consume integration test

* more work on  publish edit consume integration test

* fix edit  publish edit consume integration test

* add 3 int tests

* Updating ComputeExamples.md

* fix signature and download

* fix compute flow integration test

* udapte handleComputeOrder helper

* update datatoken instance

* update datatoken global variable

* mint ocean tokens to consumer as well and added logs

* update compute exammples

* Updating ComputeExamples.md

* wip code examples readme

* update code examples readme

* Updating CodeExamples.md

* run all tests

* update dep in readme

* update readme

* code examples update metadata flags

* update dt instance in code examples md

* set metadata updates

* Updating CodeExamples.md

* update code examples readme structure

* Updating CodeExamples.md

* update readmes table links

* Updating CodeExamples.md

* Updating ComputeExamples.md

* clean-up

* Updating CodeExamples.md

* added missing unit tests for usdc fixed rate exchange tests

* more cleanup and jsdoc updates

* more  jsdoc updates

* donw with jsdoc updates

* handle provider errors

* add missing error handling file

* adds most of the provider errors

* update get compute env return type

* Release 3.0.0-next.0

* adding Typedoc to ethers branch

* update provider signature message

* fix lint

* Release 3.0.0-next.1

* fix lint

* adding Typedoc to ethers branch

* Updating CI to build and commit the documentation

* Updating documentation

* Updating script permissions

* fix todos add missing logic to send tx

* npm package cleanups

* Release 3.0.0-next.2

* update log messages for errors

* Release 3.0.0-next.3

* fix gasFee issue on sendTx

* Release 3.0.0-next.4

* add consume params typings (#1731)

* fix gas fee estimate

* remove comments

* add some delays before resolving datasets

* adds delay to Publish flow tests

* Release 3.0.0-next.5

---------

Co-authored-by: Bogdan Fazakas <bogdan.fazakas@gmail.com>
Co-authored-by: GitHub Actions Bot <>
Co-authored-by: Jamie Hewitt <jamie.hewitt15@gmail.com>
Co-authored-by: Jamie Hewitt <jamie@oceanprotocol.com>
2023-05-29 11:20:38 +03:00
Bogdan Fazakas
cbc3cd6776
Add missing symbol and name helper on datatoken (#1667)
* add two helpers method

* fix tests

* update comments
2022-12-19 10:09:05 +00:00
Alex Coseru
ad0e724e68
Feature/add ve fee estimate (#1606)
* bump to contracts 1.1.4

* add estimateClaim

* fix

* Bump decimal.js from 10.3.1 to 10.4.0 (#1598)

Bumps [decimal.js](https://github.com/MikeMcl/decimal.js) from 10.3.1 to 10.4.0.
- [Release notes](https://github.com/MikeMcl/decimal.js/releases)
- [Changelog](https://github.com/MikeMcl/decimal.js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/MikeMcl/decimal.js/compare/v10.3.1...v10.4.0)

---
updated-dependencies:
- dependency-name: decimal.js
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump @typescript-eslint/eslint-plugin from 5.33.1 to 5.36.2 (#1601)

Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 5.33.1 to 5.36.2.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.36.2/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump eslint from 8.19.0 to 8.23.0 (#1602)

Bumps [eslint](https://github.com/eslint/eslint) from 8.19.0 to 8.23.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.19.0...v8.23.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* add graphql type (#1607)

* add graphql type

* Updating CodeExamples.md

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: GitHub Actions Bot <>
2022-09-12 18:20:21 +03:00
Alex Coseru
dd383ec365
add DataFarming contract support (#1596)
* add DataFarming contract support
2022-09-06 21:43:51 +03:00
Alex Coseru
f8f4b48243
Feature/basic ve ocean (#1595)
* bump contracts to 1.1.3

* add basic veOcean support

Co-authored-by: Bogdan Fazakas <bogdan.fazakas@gmail.com>
2022-09-06 15:00:47 +03:00
Bogdan Fazakas
89b83221de cleanups and warnings 2022-08-17 15:14:54 +03:00
Bogdan Fazakas
7500f51f46 merge v4refactoring and fixed conflicts 2022-08-17 12:37:03 +03:00
Bogdan Fazakas
30aba62ef7
Remove amm pools (#1568)
* WIP remove pools

* added logs

* update checksums and logs

* Updating CodeExamples.md

* remove console logs

* remove unused params, simplify test folder structure

* contracts folder simplification, remove ss contract methods

* path fix

* remove more "staking" code

* put back `removeApprovedToken()`

* remove redundant and unused test commands

* test fix, auto-fix & auto-format

* consistent specific imports

* readme updates

* remove addDispenserContract method

* remove tokens subfolder from contracts

* update js docs and put back addDispenserContract

* use new digest for algorthms

* update nft getData to fix failing unit test

* replace pools with fre in  buyDatatokenBatch

* use proper exchange ids

* increase allowance

* fix buyBatch test and deploy issues from testcontracthandler

Co-authored-by: GitHub Actions Bot <>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2022-08-16 11:54:28 +01:00
Bogdan Fazakas
163735335f remove duplication 2022-08-12 09:17:35 +03:00
Bogdan Fazakas
452bf22855 merge main and fixed conflicts 2022-08-11 16:13:31 +03:00
Bogdan Fazakas
470eff51ad update transfer and approve methods 2022-08-10 17:31:54 +03:00
Miquel A. Cabot
ec4b21fab5 adapt tests for datatoken.setData() 2022-07-11 23:43:57 +02:00
Miquel A. Cabot
215ddf43df test setData() 2022-07-11 23:36:20 +02:00
mihaisc
237e948107
Proper conversion to wei of base token when ordering (#1527)
* proper conversion to wei

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

* fix conversion in pool

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

* fix test

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

* fix lint

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2022-06-24 17:22:18 +03:00
Miquel A. Cabot
282cd4e865
Issue-#1485: Remove imports of ABIs in the tests and use utility tranfer(), mint(), balance() functions (#1486)
* remove imports of ABIs in NftFactory test

* fix error with data token amount

* remove imports of ABIs in FixedRateExchange test

* remove imports of ABIs in SideStaking test

* remove imports of ABIs in SideStaking test

* remove imports of ABIs in Router test
2022-06-15 18:38:32 +01:00
Miquel A. Cabot
74a3386619 general renaming in Datatoken 2022-06-14 11:23:47 +02:00
Miquel A. Cabot
6d605199df general renaming in Router 2022-06-14 11:15:45 +02:00
Miquel A. Cabot
efc4b8b521 general renaming in SideStaking 2022-06-14 11:12:06 +02:00
Miquel A. Cabot
eb41dfc7ef general renaming in Pool 2022-06-14 11:00:08 +02:00
Miquel A. Cabot
83b8d1dce3 general renaming in FixedRateExchange 2022-06-14 10:52:51 +02:00
Miquel A. Cabot
d6cbe479e1 fix lint problem 2022-06-13 12:52:31 +02:00
Miquel A. Cabot
2835304221 change ercParams to dtParams 2022-06-13 12:47:18 +02:00
Miquel A. Cabot
429cce838e revert rename deployERC20 to deployDatatoken 2022-06-10 13:24:45 +02:00
Miquel A. Cabot
ba8ea90a20 rename createNftErc20WithDispenser to createNftWithDatatokenWithDispenser 2022-06-10 11:32:58 +02:00
Miquel A. Cabot
77fcfe94f5 rename createNftErc20WithFixedRate to createNftWithDatatokenWithFixedRate 2022-06-10 11:30:22 +02:00
Miquel A. Cabot
4d56ca2e9e rename createNftErc20WithPool to createNftWithDatatokenWithPool 2022-06-10 11:28:55 +02:00
Miquel A. Cabot
2adb54c4eb rename createNftWithErc20 to createNftWithDatatoken 2022-06-10 11:26:53 +02:00
Miquel A. Cabot
f59afbdc46 rename erc20TemplateAddress to datatokenTemplateAddress 2022-06-10 11:24:18 +02:00
Miquel A. Cabot
29c581fde2 rename from erc20 to nft in comments 2022-06-10 11:19:08 +02:00
Miquel A. Cabot
3b3cd6e2e7 rename erc20 to datatoken in Router test 2022-06-10 11:13:52 +02:00
Miquel A. Cabot
a1bb98bbfb rename erc20 to datatoken in Pool test 2022-06-10 11:12:37 +02:00
Miquel A. Cabot
36986aa928 rename erc20 to datatoken in SideStaking test 2022-06-10 11:09:16 +02:00
Miquel A. Cabot
ad73cf855c rename deployERC20 to deployDatatoken 2022-06-10 11:02:01 +02:00
Miquel A. Cabot
6287005473 rename Erc20CreateParams to DatatokenCreateParams 2022-06-10 10:54:51 +02:00
Miquel A. Cabot
29222ca85b rename from erc20 to datatoken in Datatoken test 2022-06-10 10:53:38 +02:00
Miquel A. Cabot
df7cfdf231 rename from erc20 to datatoken in NFT test 2022-06-10 10:51:49 +02:00
Miquel A. Cabot
eedb1b4232 rename ERC20Deployer to DatatokenDeployer 2022-06-10 10:50:48 +02:00
Miquel A. Cabot
01859a52f8 rename createERC20 to createDatatoken 2022-06-10 10:45:56 +02:00
Miquel A. Cabot
6db0cd0627 rename removeERC20Deployer to removeDatatokenDeployer 2022-06-10 10:41:12 +02:00
Miquel A. Cabot
87b8090ce4 rename addErc20Deployer to addDatatokenDeployer 2022-06-10 10:40:08 +02:00
Miquel A. Cabot
f374230638 rename isERC20Deployer to isDatatokenDeployer 2022-06-10 10:38:33 +02:00
Miquel A. Cabot
e0a9c24ef5 change ERC721 to NFT in nftfactory test 2022-06-10 10:15:16 +02:00
Miquel A. Cabot
eaf9414adf change erc721TemplateAddress to nftTemplateAddress 2022-06-10 10:12:14 +02:00
Miquel A. Cabot
04629cd403 change ERC721 to NFT in datatoken test 2022-06-10 10:08:17 +02:00
Miquel A. Cabot
b371069d0f change erc721FactoryAddress to nftFactoryAddress 2022-06-10 10:06:50 +02:00
Miquel A. Cabot
2c8832e22c inherit FixedRateExchange from SmartContract 2022-06-06 17:43:39 +02:00