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

1122 Commits

Author SHA1 Message Date
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
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
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-ocean
c701652ee7 throw some error msgs if no tx 2024-09-25 09:56:00 +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
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
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
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
61fff3441d fix review 2024-09-11 10:14:25 +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
0e06347a0a fix minor logic issue 2024-09-09 14:46:39 +01:00
paulo-ocean
f3c44d4850 cleaning the house 2024-09-09 14:24:04 +01:00
paulo-ocean
4e954572b4 fix test fn 2024-09-09 13:14:30 +01:00
paulo-ocean
0bd720a042 try debug tests 2024-09-09 13:00:56 +01:00
paulo-ocean
13827001e8 test/unit/AssetUtils.test.ts 2024-09-09 12:46:47 +01:00
paulo-ocean
df2d5dd054 try another way, debug 2024-09-09 12:06:04 +01:00
paulo-ocean
36f1865175 more debug, try fn workaround 2024-09-09 11:41:21 +01:00
paulo-ocean
4d14dae3aa debug ethers on hardhat 2024-09-09 10:55:33 +01:00
paulo-ocean
9ec89b6ab0 debug ethers on hardhat 2024-09-09 10:46:26 +01:00
paulo-ocean
a049a1a488 use hardhat getContractAt 2024-09-09 10:20:47 +01:00
paulo-ocean
e855f787c5 remove debug comments, add comment for todo 2024-09-06 18:45:35 +01:00
paulo-ocean
e245795924 try add erc 20 templates to config obj 2024-09-06 18:32:12 +01:00
paulo-ocean
92a5ff92af more debugging 2024-09-06 18:07:11 +01:00
paulo-ocean
fe3fbc4edd debug test 2024-09-06 16:01:06 +01:00
paulo-ocean
9277847279 fixes on the checks, also consider name typos, as we currently have 2024-09-06 15:07:57 +01:00
paulo-ocean
ee02a0e2c4 more unit tests, template index 2024-09-05 16:06:41 +01:00
paulo-ocean
b48c48b8fb fix import style 2024-09-05 15:55:43 +01:00
paulo-ocean
995a7f0ef9 wip: add unit test 2024-09-05 14:59:16 +01:00
paulo-ocean
f59f3da675 add base network config settings for oasis testnet 2024-09-05 14:25:50 +01:00
paulo-ocean
57ffc12793 wip: calculate template index 2024-09-05 12:42:21 +01:00
paulo-ocean
f5166bd08c wip... refactroing.. 2024-09-05 11:27:07 +01:00
paulo-ocean
6bca7d6c56 few more changes, use config 2024-09-03 16:53:32 +01:00