Skip to content

Commit

Permalink
Integrate contracts v2.2.0 (#1845)
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
mariacarmina authored Oct 1, 2024
1 parent aeae593 commit a2861ef
Show file tree
Hide file tree
Showing 14 changed files with 1,362 additions and 123 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v2
- uses: actions/setup-node@v4
with:
node-version: '20'
registry-url: https://registry.npmjs.org/
Expand Down
16 changes: 16 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,22 @@ npm run test:integration
npm run test:integration:cover
```

### Sapphire Integration Tests

We are currently using the live Oasis Sapphire Test network for the integration tests.
Please export the `PRIVATE_KEY` and `PRIVATE_KEY_CONSUMER` before running the tests.
```bash
export PRIVATE_KEY='0x<YOUR_PRIVATE_KEY>'
export PRIVATE_KEY_CONSUMER='0x<YOUR_CONSUMER_PRIVATE_KEY>'
```

Then, you can execute the tests individually with:

```bash
npm run test:sapphire
```


> Note: On macOS, changes to the `provider`, `metadataCache` and `subgraph` URLs are required, as their default `barge` IPs can not be accessed due to network constraints on macOS. Instead use `http://127.0.0.1` for each direct call to the mentioned services, but keep the internal `provider` URL (`http://172.15.0.4:8030`) hardcoded inside all DDO's `serviceEndpoint`, and when calling `nft.setMetadata()`.
## 🛳 Production
Expand Down
Loading

0 comments on commit a2861ef

Please sign in to comment.