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

3250 Commits

Author SHA1 Message Date
Filip Masar
bae18749bf fix tests tsconfig path in eslint 2024-10-17 22:36:43 +02:00
Filip Masar
aa4f0fe566 generate types to dist/types 2024-10-17 13:00:16 +02:00
mariacarmina
0e42ce3f64 Release 3.4.2 v3.4.2 2024-10-16 15:32:24 +03:00
Maria Carmina
a0a8df328f
Add confidential EVM flag when creating a datatoken 4 in NFT class (#1859)
* Add confidential EVM flag when creating a datatoken 4.

* Add comments.

* fix lint.

* fix lint.

* Add chain id check to bundled functions.

* Updating CodeExamples.md

* Updating ComputeExamples.md

* Used config object.

* Added check for sapphire confidential EVM. Fix tests.

* Added sapphire wrap signer for all contracts.

* Make network mandatory field.

* Undo making network mandatory.

* refactor condition.

* refactor condition.

* Add condition when creating NFT.

* Refactor with sdk.

* fix lint.

* tweak.

* tweak.

* Created protected function to get vthe signer according to the sdk from config.

* Fix lint. Add check for sdk within the config.

* Fix lint.

* Updating CodeExamples.md

* Updating ComputeExamples.md

---------

Co-authored-by: GitHub Actions Bot <>
2024-10-16 15:27:41 +03:00
Jamie Hewitt
cc91e1d376 Release 3.4.1 v3.4.1 2024-10-09 11:31:39 +03:00
Jamie Hewitt
746d3eb5a8
Merge pull request #1860 from oceanprotocol/updateExports
Updating oasis exports
2024-10-09 11:28:10 +03:00
Maria Carmina
9c25342c8e
Fix ipfs CID. (#1851)
* Fix ipfs CID.

* fix lint

* tweaks.

* Upgrade Github actions.

* fix graphql asset url.

* Fix cov.

* remove duplicate test.

* Surround by it block.

* debug log.

* added docker logs only for ipfs

* increase timeout.

* debug log.

* Changed to ipfs cluster.

* roll back.

* put in the same test with arweave.

* debug.

* Log initialize url.

* logs.

* tweak condition.

* changed cid with the one from cluster.

* Rename test. Added back uploading in ipfs.

* Fix review.
2024-10-09 11:18:46 +03:00
Jamie Hewitt
a29faeeaa9 Updating oasis exports 2024-10-09 11:05:30 +03:00
AdriGeorge
9cb2ea0a02
chore: get router factory address from config (#1858)
Co-authored-by: Bogdan Fazakas <bogdan.fazakas@gmail.com>
2024-10-08 09:59:36 +03:00
Jamie Hewitt
e6d7d7c60c Release 3.4.0 v3.4.0 2024-10-07 14:47:19 +03:00
paulo@oceanprotocol
7b340ad607
Merge pull request #1843 from oceanprotocol/issue-1841-pub-flow
Issue 1841 pub flow - createAsset Fn
2024-10-04 12:59:25 +01:00
paulo-ocean
ea7562f908 clean test 2024-10-02 09:18:21 +01:00
paulo-ocean
c657547adb Merge branch 'main' into issue-1841-pub-flow 2024-10-02 09:04:32 +01:00
Filip Masar
fdfe741013
Merge pull request #1855 from oceanprotocol/feature/credentials-on-service-level
add credentials to service type
2024-10-01 12:02:27 +02:00
paulo-ocean
c80d69ec32 remove duplicate file + fix import 2024-10-01 10:30:25 +01:00
paulo-ocean
8d579de47a merge main & fix conflicts 2024-10-01 10:25:06 +01:00
Maria Carmina
a2861ef4de
Integrate contracts v2.2.0 (#1845)
* Created AccessList contract.

* Created new Datatoken4 template.

* set file object fc.

* integrated datatoken 4 contract.

* install new version of ocean contracts.

* added sapphire sdk + remove private functions.

* tweaks of template4.

* wrap signer on access list contract.

* Added minimum gas fees for sapphire networks. Send function.

* Convert to contract functions. Remove abiEnterprise.

* Upgraded contracts v2.2.0.

* Integrated Access List factory. Created tests.

* Rename file.

* Add script for testing sapphire functionality.

* Remove sapphire sdk from accesslist contract.

* Added new functions to access list contract.

* Remove script.

* Remove script.

* Increase timeout to the tests.

* Added js script. Modified gitignore.

* Install tsx, added oasis testnet into config helpers.

* Modified provider signature.

* fix lint.

* Fix type module.

* commented ordering other assets different than URL.

* Added check for file object for template index.

* fix deploy erc20 template 4 test.

* Calculate index function. Fix review.

* Change to this.signer.

* Uncommented orders.

* Upgrade Github actions.

* Condition for calculation of template index.

* Specify ABI in the tests.

* Test w soulbound contracts.

* Fixed wallet address for test.

* Add deny list check.

* Store access list address within the constructor. Added tests.

* add debug log.

* Create new datatoken for consumer.

* distinguish coverage reports.

* Fix coverage download report.

* cleanup. added tests.

* fix tests.

* Remove unused imports.

* Increase timeout.

* Added test with encrypted tx.

* comment the test file.

* Add test back + add ABI.

* added debug log.

* increase timeout.

* Comment tests with external services.

* fix graphql URL.

* Insert arweave.

* Insert ipfs.

* cleanup. mention ipfs issue.

* Fixes. Added getFilesObject back.

* fix review.

* replace srv id w srv index.

* Fix doc.

* Remove wrap call from constructor.

* Modify README.

* Added check for tx.

* fix check.

* remove duplicate test.
2024-10-01 11:40:33 +03:00
Maria Carmina
aeae593335
Merge pull request #1854 from oceanprotocol/checks-nft-tx
Added additional check for NFT tx.
2024-09-25 23:01:23 +03:00
paulo@oceanprotocol
5136d10f4c
Merge pull request #1857 from oceanprotocol/issue-1856-improve-error
throw some error msgs if no tx
2024-09-25 12:28:24 +01:00
paulo-ocean
c701652ee7 throw some error msgs if no tx 2024-09-25 09:56:00 +01:00
paulo@oceanprotocol
443d748b3b
Merge pull request #1793 from oceanprotocol/bugfix/order_fix
Fix non existing transaction error
2024-09-25 09:52:52 +01:00
paulo-ocean
25c4488df6 Merge branch 'main' into bugfix/order_fix 2024-09-25 09:20:05 +01:00
Filip Masar
6cdf69547c add credentials to service type 2024-09-24 15:35:08 +02:00
mariacarmina
1e0c75f4a2 Added additional check for NFT tx. 2024-09-24 16:12:45 +03:00
paulo-ocean
7da351bd3e Merge branch 'main' into issue-1841-pub-flow 2024-09-24 09:41:13 +01:00
Maria Carmina
eb6d84edce
Merge pull request #1853 from oceanprotocol/fix-try-catch-nft-creation
Fix try catch nft creation
2024-09-23 16:35:05 +03:00
mariacarmina
988874a3fd Aggregate coverage. 2024-09-23 13:48:30 +03:00
mariacarmina
c160700eb3 Upgrade CI. 2024-09-23 13:32:42 +03:00
mariacarmina
f2e5a3b098 Add try/catch for failed transactions when deploying new NFT. 2024-09-23 13:28:58 +03:00
paulo-ocean
6ea2ea274a update files object 2024-09-18 13:06:32 +01:00
paulo-ocean
3255ce173a small changes for order 2024-09-17 12:53:06 +01:00
paulo-ocean
a06a5c5cab fix files, string, cannot be null 2024-09-13 14:26:07 +01:00
paulo-ocean
d4272f48f8 fix download artifact name 2024-09-13 11:07:38 +01:00
paulo-ocean
c7ad0d5592 fix name of artifacts 2024-09-13 09:48:38 +01:00
paulo-ocean
fdc35ab800 fix create erc params 2024-09-13 09:21:04 +01:00
paulo-ocean
4bcb1d9348 some fixes + cleaning 2024-09-13 09:09:16 +01:00
paulo-ocean
442eef760f update github artifacts 2024-09-13 08:55:34 +01:00
paulo-ocean
b5a2a64271 added changes for access lists 2024-09-12 18:59:06 +01:00
paulo-ocean
51ddf52d58 some fix and refactor 2024-09-12 13:18:16 +01:00
paulo-ocean
06fd7f8e18 restore package lock 2024-09-12 09:19:39 +01:00
paulo-ocean
0eeacbcc3e restore changelog 2024-09-12 09:15:54 +01:00
paulo-ocean
470c2ee423 put version 3.3.3 back 2024-09-12 09:05:44 +01:00
paulo-ocean
14894c769f Release 3.3.4-next.1 2024-09-12 08:40:59 +01:00
paulo-ocean
61fff3441d fix review 2024-09-11 10:14:25 +01:00
paulo-ocean
dc25a90871 Release 3.3.4-next.0 v3.3.4-next.0 2024-09-10 15:05:55 +01:00
paulo-ocean
7332252a57 fix lint 2024-09-10 14:58:07 +01:00
paulo-ocean
d9bbaff8e1 some refactor and commenst 2024-09-10 14:57:19 +01:00
paulo-ocean
fb810795d0 update proper abi json file 2024-09-10 14:43:20 +01:00
paulo-ocean
d141ddc900 remove hardhat config file 2024-09-09 15:14:20 +01:00
paulo-ocean
0e06347a0a fix minor logic issue 2024-09-09 14:46:39 +01:00