diff --git a/.codeclimate.yml b/.codeclimate.yml index a223db4e1..7fb54926f 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -1,5 +1,5 @@ ## -## Copyright 2022 Ocean Protocol Foundation +## Copyright 2023 Ocean Protocol Foundation ## SPDX-License-Identifier: Apache-2.0 ## version: "2" diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 4e07d7e32..46cbfbbdb 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,5 +1,5 @@ ## -## Copyright 2022 Ocean Protocol Foundation +## Copyright 2023 Ocean Protocol Foundation ## SPDX-License-Identifier: Apache-2.0 ## diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml index 2e7a222d8..1de0f1744 100644 --- a/.github/workflows/black.yml +++ b/.github/workflows/black.yml @@ -1,5 +1,5 @@ ## -## Copyright 2022 Ocean Protocol Foundation +## Copyright 2023 Ocean Protocol Foundation ## SPDX-License-Identifier: Apache-2.0 ## name: black diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e2d26c20f..b587f9c93 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,5 +1,5 @@ ## -## Copyright 2022 Ocean Protocol Foundation +## Copyright 2023 Ocean Protocol Foundation ## SPDX-License-Identifier: Apache-2.0 ## name: Ocean.py multiple OS diff --git a/.github/workflows/libcheck.yml b/.github/workflows/libcheck.yml index e043accee..8d407eee5 100644 --- a/.github/workflows/libcheck.yml +++ b/.github/workflows/libcheck.yml @@ -1,5 +1,5 @@ ## -## Copyright 2022 Ocean Protocol Foundation +## Copyright 2023 Ocean Protocol Foundation ## SPDX-License-Identifier: Apache-2.0 ## name: Ocean.py library check diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 364f6af9a..f934a1a7a 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -1,5 +1,5 @@ ## -## Copyright 2022 Ocean Protocol Foundation +## Copyright 2023 Ocean Protocol Foundation ## SPDX-License-Identifier: Apache-2.0 ## name: Ocean.py tests diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2a7c73f3a..f95e42e4c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,5 +1,5 @@ ## -## Copyright 2022 Ocean Protocol Foundation +## Copyright 2023 Ocean Protocol Foundation ## SPDX-License-Identifier: Apache-2.0 ## name: Ocean.py release diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5d8282e11..5382f27b9 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,5 +1,5 @@ ## -## Copyright 2022 Ocean Protocol Foundation +## Copyright 2023 Ocean Protocol Foundation ## SPDX-License-Identifier: Apache-2.0 ## repos: diff --git a/.prospector.yml b/.prospector.yml index cf004aaff..914e8b595 100644 --- a/.prospector.yml +++ b/.prospector.yml @@ -1,5 +1,5 @@ ## -## Copyright 2022 Ocean Protocol Foundation +## Copyright 2023 Ocean Protocol Foundation ## SPDX-License-Identifier: Apache-2.0 ## pep257: diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f5a7e70a..0a4e18267 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ See [`releases`](https://github.com/oceanprotocol/ocean.py/releases). diff --git a/README.md b/README.md index a3996dd92..c30682b96 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@ -[![banner](https://raw.githubusercontent.com/oceanprotocol/art/master/github/repo-banner%402x.png)](https://oceanprotocol.com) +

+ +

-

ocean.py

- -> Python library to privately & securely publish, exchange, and consume data. +> ocean.py: a Python library to privately & securely publish, exchange, and consume data. [![Maintainability](https://api.codeclimate.com/v1/badges/a0be65f412a35440c63e/maintainability)](https://codeclimate.com/github/oceanprotocol/ocean.py/maintainability) [![Test Coverage](https://api.codeclimate.com/v1/badges/a0be65f412a35440c63e/test_coverage)](https://codeclimate.com/github/oceanprotocol/ocean.py/test_coverage) @@ -31,9 +31,9 @@ This is in beta state. If you run into problems, please open up a [new issue](/i Follow these steps in sequence to ramp into Ocean. 1. **[Install Ocean](READMEs/install.md)** - 2. **[Set up locally](READMEs/setup-local.md)** + 2. **[Set up locally](READMEs/setup-local.md)** 3. **[Walk through main flow (local setup)](READMEs/main-flow.md)**: publish asset, post for free / for sale, dispense it / buy it, and consume it - + Now let's do remote flows: 4. **[Set up remotely](READMEs/setup-remote.md)** diff --git a/READMEs/c2d-flow-more-examples.md b/READMEs/c2d-flow-more-examples.md index 45d974eca..4fc7247e3 100644 --- a/READMEs/c2d-flow-more-examples.md +++ b/READMEs/c2d-flow-more-examples.md @@ -1,5 +1,5 @@ diff --git a/READMEs/c2d-flow.md b/READMEs/c2d-flow.md index 8666aa4f5..d8951f76d 100644 --- a/READMEs/c2d-flow.md +++ b/READMEs/c2d-flow.md @@ -1,5 +1,5 @@ diff --git a/READMEs/developers.md b/READMEs/developers.md index 7be500e61..3c6be8332 100644 --- a/READMEs/developers.md +++ b/READMEs/developers.md @@ -1,5 +1,5 @@ diff --git a/READMEs/df.md b/READMEs/df.md index ab65de253..2cfa6ae10 100644 --- a/READMEs/df.md +++ b/READMEs/df.md @@ -1,5 +1,5 @@ # Quickstart: Data Farming Flow diff --git a/READMEs/install.md b/READMEs/install.md index 3c6a957e9..2dc6a5ea8 100644 --- a/READMEs/install.md +++ b/READMEs/install.md @@ -1,5 +1,5 @@ # Install Ocean diff --git a/READMEs/key-value-private.md b/READMEs/key-value-private.md index fdf65f921..84f76b2a2 100644 --- a/READMEs/key-value-private.md +++ b/READMEs/key-value-private.md @@ -1,5 +1,5 @@ diff --git a/READMEs/key-value-public.md b/READMEs/key-value-public.md index 074eedf12..f352cb1ab 100644 --- a/READMEs/key-value-public.md +++ b/READMEs/key-value-public.md @@ -1,5 +1,5 @@ diff --git a/READMEs/main-flow.md b/READMEs/main-flow.md index a837089b8..3eb974fea 100644 --- a/READMEs/main-flow.md +++ b/READMEs/main-flow.md @@ -1,5 +1,5 @@ diff --git a/READMEs/parameters.md b/READMEs/parameters.md index 2f9f0121e..a04be4704 100644 --- a/READMEs/parameters.md +++ b/READMEs/parameters.md @@ -1,5 +1,5 @@ diff --git a/READMEs/profile-nfts-flow.md b/READMEs/profile-nfts-flow.md index 55ac7cb46..dc3d0474d 100644 --- a/READMEs/profile-nfts-flow.md +++ b/READMEs/profile-nfts-flow.md @@ -1,5 +1,5 @@ diff --git a/READMEs/publish-flow-graphql.md b/READMEs/publish-flow-graphql.md index 94b3d780b..ca79eea74 100644 --- a/READMEs/publish-flow-graphql.md +++ b/READMEs/publish-flow-graphql.md @@ -1,5 +1,5 @@ diff --git a/READMEs/publish-flow-onchain.md b/READMEs/publish-flow-onchain.md index 78e6e6f35..e5d0326f4 100644 --- a/READMEs/publish-flow-onchain.md +++ b/READMEs/publish-flow-onchain.md @@ -1,5 +1,5 @@ diff --git a/READMEs/publish-flow-restapi.md b/READMEs/publish-flow-restapi.md index a344f531c..fd2f81e2c 100644 --- a/READMEs/publish-flow-restapi.md +++ b/READMEs/publish-flow-restapi.md @@ -1,5 +1,5 @@ diff --git a/READMEs/release-process.md b/READMEs/release-process.md index 4620fa42a..dd293d947 100644 --- a/READMEs/release-process.md +++ b/READMEs/release-process.md @@ -1,5 +1,5 @@ diff --git a/READMEs/search-and-filter-assets.md b/READMEs/search-and-filter-assets.md index c8daee5ff..371667760 100644 --- a/READMEs/search-and-filter-assets.md +++ b/READMEs/search-and-filter-assets.md @@ -1,5 +1,5 @@ diff --git a/READMEs/services.md b/READMEs/services.md index d6b3942da..2d79df4c1 100644 --- a/READMEs/services.md +++ b/READMEs/services.md @@ -1,5 +1,5 @@ diff --git a/READMEs/setup-local.md b/READMEs/setup-local.md index 7c8f3e62c..00b2ca2e0 100644 --- a/READMEs/setup-local.md +++ b/READMEs/setup-local.md @@ -1,5 +1,5 @@ diff --git a/READMEs/setup-remote.md b/READMEs/setup-remote.md index e275155c3..8f01dfa76 100644 --- a/READMEs/setup-remote.md +++ b/READMEs/setup-remote.md @@ -1,5 +1,5 @@ diff --git a/bumpversion.sh b/bumpversion.sh index 5f2697f66..2de53d85b 100755 --- a/bumpversion.sh +++ b/bumpversion.sh @@ -1,6 +1,6 @@ #!/bin/bash ## -## Copyright 2022 Ocean Protocol Foundation +## Copyright 2023 Ocean Protocol Foundation ## SPDX-License-Identifier: Apache-2.0 ## diff --git a/conftest.py b/conftest.py index 6eeba1cb4..742aa53b0 100644 --- a/conftest.py +++ b/conftest.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # diff --git a/conftest_ganache.py b/conftest_ganache.py index fb0843831..c7c9ac762 100644 --- a/conftest_ganache.py +++ b/conftest_ganache.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # from typing import Tuple diff --git a/ocean_lib/__init__.py b/ocean_lib/__init__.py index 9803d2440..390adab2f 100644 --- a/ocean_lib/__init__.py +++ b/ocean_lib/__init__.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # diff --git a/ocean_lib/agreements/__init__.py b/ocean_lib/agreements/__init__.py index b07ba3365..850b262f1 100644 --- a/ocean_lib/agreements/__init__.py +++ b/ocean_lib/agreements/__init__.py @@ -1,4 +1,4 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # diff --git a/ocean_lib/agreements/consumable.py b/ocean_lib/agreements/consumable.py index 73f74f90f..9b6d53d95 100644 --- a/ocean_lib/agreements/consumable.py +++ b/ocean_lib/agreements/consumable.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # from enforce_typing import enforce_types diff --git a/ocean_lib/agreements/service_types.py b/ocean_lib/agreements/service_types.py index 525c10067..fd76ec3c2 100644 --- a/ocean_lib/agreements/service_types.py +++ b/ocean_lib/agreements/service_types.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # """Agreements module.""" diff --git a/ocean_lib/aquarius/__init__.py b/ocean_lib/aquarius/__init__.py index 909b960f4..623e8789c 100644 --- a/ocean_lib/aquarius/__init__.py +++ b/ocean_lib/aquarius/__init__.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # """Ocean Aquarius module.""" diff --git a/ocean_lib/aquarius/aquarius.py b/ocean_lib/aquarius/aquarius.py index 6f2fed0d3..79420e5c7 100644 --- a/ocean_lib/aquarius/aquarius.py +++ b/ocean_lib/aquarius/aquarius.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # """ diff --git a/ocean_lib/aquarius/test/__init__.py b/ocean_lib/aquarius/test/__init__.py index b07ba3365..850b262f1 100644 --- a/ocean_lib/aquarius/test/__init__.py +++ b/ocean_lib/aquarius/test/__init__.py @@ -1,4 +1,4 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # diff --git a/ocean_lib/aquarius/test/test_aquarius.py b/ocean_lib/aquarius/test/test_aquarius.py index d9be464d4..2574577aa 100644 --- a/ocean_lib/aquarius/test/test_aquarius.py +++ b/ocean_lib/aquarius/test/test_aquarius.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import pytest diff --git a/ocean_lib/assets/__init__.py b/ocean_lib/assets/__init__.py index b07ba3365..850b262f1 100644 --- a/ocean_lib/assets/__init__.py +++ b/ocean_lib/assets/__init__.py @@ -1,4 +1,4 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # diff --git a/ocean_lib/assets/asset_downloader.py b/ocean_lib/assets/asset_downloader.py index c15b33e1f..180d3df2a 100644 --- a/ocean_lib/assets/asset_downloader.py +++ b/ocean_lib/assets/asset_downloader.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # diff --git a/ocean_lib/assets/credentials.py b/ocean_lib/assets/credentials.py index d6162d955..0c1ef5397 100644 --- a/ocean_lib/assets/credentials.py +++ b/ocean_lib/assets/credentials.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # from typing import Optional diff --git a/ocean_lib/assets/ddo.py b/ocean_lib/assets/ddo.py index df759b33f..3a3e50eb8 100644 --- a/ocean_lib/assets/ddo.py +++ b/ocean_lib/assets/ddo.py @@ -1,10 +1,10 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import copy import logging -from typing import List, Optional, Union +from typing import Optional from enforce_typing import enforce_types @@ -12,7 +12,6 @@ from ocean_lib.data_provider.fileinfo_provider import FileInfoProvider from ocean_lib.ocean.util import create_checksum from ocean_lib.services.service import Service -from ocean_lib.structures.file_objects import FilesType logger = logging.getLogger("ddo") diff --git a/ocean_lib/assets/test/__init__.py b/ocean_lib/assets/test/__init__.py index b07ba3365..850b262f1 100644 --- a/ocean_lib/assets/test/__init__.py +++ b/ocean_lib/assets/test/__init__.py @@ -1,4 +1,4 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # diff --git a/ocean_lib/assets/test/test_asset_downloader.py b/ocean_lib/assets/test/test_asset_downloader.py index 371ecf2b7..44b0281c9 100644 --- a/ocean_lib/assets/test/test_asset_downloader.py +++ b/ocean_lib/assets/test/test_asset_downloader.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import os diff --git a/ocean_lib/assets/test/test_ddo.py b/ocean_lib/assets/test/test_ddo.py index 897b1bf02..b9f7831f6 100644 --- a/ocean_lib/assets/test/test_ddo.py +++ b/ocean_lib/assets/test/test_ddo.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import pytest diff --git a/ocean_lib/data_provider/__init__.py b/ocean_lib/data_provider/__init__.py index b07ba3365..850b262f1 100644 --- a/ocean_lib/data_provider/__init__.py +++ b/ocean_lib/data_provider/__init__.py @@ -1,4 +1,4 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # diff --git a/ocean_lib/data_provider/base.py b/ocean_lib/data_provider/base.py index da4f55b3e..ee757ee63 100644 --- a/ocean_lib/data_provider/base.py +++ b/ocean_lib/data_provider/base.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # diff --git a/ocean_lib/data_provider/data_encryptor.py b/ocean_lib/data_provider/data_encryptor.py index 95954ea56..b307faaf6 100644 --- a/ocean_lib/data_provider/data_encryptor.py +++ b/ocean_lib/data_provider/data_encryptor.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # diff --git a/ocean_lib/data_provider/data_service_provider.py b/ocean_lib/data_provider/data_service_provider.py index 7d82c9c8d..863220266 100644 --- a/ocean_lib/data_provider/data_service_provider.py +++ b/ocean_lib/data_provider/data_service_provider.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # diff --git a/ocean_lib/data_provider/fileinfo_provider.py b/ocean_lib/data_provider/fileinfo_provider.py index 159cbeb89..1d79bf691 100644 --- a/ocean_lib/data_provider/fileinfo_provider.py +++ b/ocean_lib/data_provider/fileinfo_provider.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # diff --git a/ocean_lib/data_provider/test/__init__.py b/ocean_lib/data_provider/test/__init__.py index b07ba3365..850b262f1 100644 --- a/ocean_lib/data_provider/test/__init__.py +++ b/ocean_lib/data_provider/test/__init__.py @@ -1,4 +1,4 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # diff --git a/ocean_lib/data_provider/test/test_base.py b/ocean_lib/data_provider/test/test_base.py index 4b336da73..d7f6561be 100644 --- a/ocean_lib/data_provider/test/test_base.py +++ b/ocean_lib/data_provider/test/test_base.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # from requests.models import Response diff --git a/ocean_lib/data_provider/test/test_data_service_provider.py b/ocean_lib/data_provider/test/test_data_service_provider.py index 4b3decbf4..f565d4581 100644 --- a/ocean_lib/data_provider/test/test_data_service_provider.py +++ b/ocean_lib/data_provider/test/test_data_service_provider.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import json diff --git a/ocean_lib/example_config.py b/ocean_lib/example_config.py index 726695954..d55fc75d9 100644 --- a/ocean_lib/example_config.py +++ b/ocean_lib/example_config.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # diff --git a/ocean_lib/exceptions.py b/ocean_lib/exceptions.py index b57623d57..fa3cd2063 100644 --- a/ocean_lib/exceptions.py +++ b/ocean_lib/exceptions.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # diff --git a/ocean_lib/http_requests/__init__.py b/ocean_lib/http_requests/__init__.py index b07ba3365..850b262f1 100644 --- a/ocean_lib/http_requests/__init__.py +++ b/ocean_lib/http_requests/__init__.py @@ -1,4 +1,4 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # diff --git a/ocean_lib/http_requests/requests_session.py b/ocean_lib/http_requests/requests_session.py index f7769a947..0dfe7f875 100644 --- a/ocean_lib/http_requests/requests_session.py +++ b/ocean_lib/http_requests/requests_session.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # from enforce_typing import enforce_types diff --git a/ocean_lib/models/__init__.py b/ocean_lib/models/__init__.py index b07ba3365..850b262f1 100644 --- a/ocean_lib/models/__init__.py +++ b/ocean_lib/models/__init__.py @@ -1,4 +1,4 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # diff --git a/ocean_lib/models/compute_input.py b/ocean_lib/models/compute_input.py index 51293791e..5f95b3db2 100644 --- a/ocean_lib/models/compute_input.py +++ b/ocean_lib/models/compute_input.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # from typing import Dict, Optional, Union diff --git a/ocean_lib/models/data_nft.py b/ocean_lib/models/data_nft.py index 0cceeb9ef..68d363259 100644 --- a/ocean_lib/models/data_nft.py +++ b/ocean_lib/models/data_nft.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import json diff --git a/ocean_lib/models/data_nft_factory.py b/ocean_lib/models/data_nft_factory.py index 50af8aeff..21981ea53 100644 --- a/ocean_lib/models/data_nft_factory.py +++ b/ocean_lib/models/data_nft_factory.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # from typing import List, Optional, Union diff --git a/ocean_lib/models/datatoken1.py b/ocean_lib/models/datatoken1.py index 4732e475d..c65802793 100644 --- a/ocean_lib/models/datatoken1.py +++ b/ocean_lib/models/datatoken1.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import logging diff --git a/ocean_lib/models/datatoken2.py b/ocean_lib/models/datatoken2.py index 9af0e2fa5..fec22144f 100644 --- a/ocean_lib/models/datatoken2.py +++ b/ocean_lib/models/datatoken2.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # from typing import Any, Optional, Union diff --git a/ocean_lib/models/datatoken_base.py b/ocean_lib/models/datatoken_base.py index 13afeceb6..33e138475 100644 --- a/ocean_lib/models/datatoken_base.py +++ b/ocean_lib/models/datatoken_base.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import logging diff --git a/ocean_lib/models/df/df_rewards.py b/ocean_lib/models/df/df_rewards.py index 0378764f0..d76c28ad0 100644 --- a/ocean_lib/models/df/df_rewards.py +++ b/ocean_lib/models/df/df_rewards.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # from ocean_lib.web3_internal.contract_base import ContractBase diff --git a/ocean_lib/models/df/df_strategy_v1.py b/ocean_lib/models/df/df_strategy_v1.py index cb46372bf..0a1841305 100644 --- a/ocean_lib/models/df/df_strategy_v1.py +++ b/ocean_lib/models/df/df_strategy_v1.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # from ocean_lib.web3_internal.contract_base import ContractBase diff --git a/ocean_lib/models/df/test/conftest.py b/ocean_lib/models/df/test/conftest.py index c2b643234..f5234923d 100644 --- a/ocean_lib/models/df/test/conftest.py +++ b/ocean_lib/models/df/test/conftest.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import pytest diff --git a/ocean_lib/models/df/test/test_df_rewards.py b/ocean_lib/models/df/test/test_df_rewards.py index b8ed478e2..fa4c28e1e 100644 --- a/ocean_lib/models/df/test/test_df_rewards.py +++ b/ocean_lib/models/df/test/test_df_rewards.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import pytest diff --git a/ocean_lib/models/df/test/test_df_strategy_v1.py b/ocean_lib/models/df/test/test_df_strategy_v1.py index b8ed478e2..fa4c28e1e 100644 --- a/ocean_lib/models/df/test/test_df_strategy_v1.py +++ b/ocean_lib/models/df/test/test_df_strategy_v1.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import pytest diff --git a/ocean_lib/models/dispenser.py b/ocean_lib/models/dispenser.py index 5e8990da5..24d3baafc 100644 --- a/ocean_lib/models/dispenser.py +++ b/ocean_lib/models/dispenser.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # from typing import Optional, Union @@ -10,7 +10,6 @@ from ocean_lib.web3_internal.constants import MAX_UINT256, ZERO_ADDRESS from ocean_lib.web3_internal.contract_base import ContractBase - """ def activate(dt_addr: str, max_tokens: int, max_balance: int) -> None: activate dispenser after deactivation diff --git a/ocean_lib/models/erc721_token_factory_base.py b/ocean_lib/models/erc721_token_factory_base.py index 303f56015..295ec2cb5 100644 --- a/ocean_lib/models/erc721_token_factory_base.py +++ b/ocean_lib/models/erc721_token_factory_base.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # from abc import ABC diff --git a/ocean_lib/models/factory_router.py b/ocean_lib/models/factory_router.py index 6b7c484e2..aa8a1ac3b 100644 --- a/ocean_lib/models/factory_router.py +++ b/ocean_lib/models/factory_router.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # from ocean_lib.web3_internal.contract_base import ContractBase diff --git a/ocean_lib/models/fixed_rate_exchange.py b/ocean_lib/models/fixed_rate_exchange.py index f7200285d..c80287d5a 100644 --- a/ocean_lib/models/fixed_rate_exchange.py +++ b/ocean_lib/models/fixed_rate_exchange.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # from typing import Optional, Union diff --git a/ocean_lib/models/test/__init__.py b/ocean_lib/models/test/__init__.py index b07ba3365..850b262f1 100644 --- a/ocean_lib/models/test/__init__.py +++ b/ocean_lib/models/test/__init__.py @@ -1,4 +1,4 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # diff --git a/ocean_lib/models/test/conftest.py b/ocean_lib/models/test/conftest.py index 20aeb24d5..937fb4319 100644 --- a/ocean_lib/models/test/conftest.py +++ b/ocean_lib/models/test/conftest.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # from conftest_ganache import * diff --git a/ocean_lib/models/test/test_data_nft.py b/ocean_lib/models/test/test_data_nft.py index b72ee6cbf..e838efa98 100644 --- a/ocean_lib/models/test/test_data_nft.py +++ b/ocean_lib/models/test/test_data_nft.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import json diff --git a/ocean_lib/models/test/test_data_nft_factory.py b/ocean_lib/models/test/test_data_nft_factory.py index 0a446e2ce..ddc231e0d 100644 --- a/ocean_lib/models/test/test_data_nft_factory.py +++ b/ocean_lib/models/test/test_data_nft_factory.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import pytest diff --git a/ocean_lib/models/test/test_datatoken.py b/ocean_lib/models/test/test_datatoken.py index a9413dd8a..22992b731 100644 --- a/ocean_lib/models/test/test_datatoken.py +++ b/ocean_lib/models/test/test_datatoken.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import pytest diff --git a/ocean_lib/models/test/test_datatoken_order_both_templates.py b/ocean_lib/models/test/test_datatoken_order_both_templates.py index 2f6ca321b..0db8a6d39 100644 --- a/ocean_lib/models/test/test_datatoken_order_both_templates.py +++ b/ocean_lib/models/test/test_datatoken_order_both_templates.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # from datetime import datetime diff --git a/ocean_lib/models/test/test_dispenser.py b/ocean_lib/models/test/test_dispenser.py index 20c4f40d2..3a885f15e 100644 --- a/ocean_lib/models/test/test_dispenser.py +++ b/ocean_lib/models/test/test_dispenser.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import pytest diff --git a/ocean_lib/models/test/test_exchange_fees.py b/ocean_lib/models/test/test_exchange_fees.py index cbc9176ca..ca4b9d4d3 100644 --- a/ocean_lib/models/test/test_exchange_fees.py +++ b/ocean_lib/models/test/test_exchange_fees.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import pytest diff --git a/ocean_lib/models/test/test_exchange_main.py b/ocean_lib/models/test/test_exchange_main.py index 6ce39a432..0938a2ca3 100644 --- a/ocean_lib/models/test/test_exchange_main.py +++ b/ocean_lib/models/test/test_exchange_main.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import time diff --git a/ocean_lib/models/test/test_factory_router.py b/ocean_lib/models/test/test_factory_router.py index 59c019052..58388db89 100644 --- a/ocean_lib/models/test/test_factory_router.py +++ b/ocean_lib/models/test/test_factory_router.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import pytest diff --git a/ocean_lib/models/test/test_fake_ocean.py b/ocean_lib/models/test/test_fake_ocean.py index 961b027e9..bb5ddc17f 100644 --- a/ocean_lib/models/test/test_fake_ocean.py +++ b/ocean_lib/models/test/test_fake_ocean.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import os diff --git a/ocean_lib/models/ve/smart_wallet_checker.py b/ocean_lib/models/ve/smart_wallet_checker.py index 8a78e2fa3..e5da4fcea 100644 --- a/ocean_lib/models/ve/smart_wallet_checker.py +++ b/ocean_lib/models/ve/smart_wallet_checker.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # from ocean_lib.web3_internal.contract_base import ContractBase diff --git a/ocean_lib/models/ve/test/conftest.py b/ocean_lib/models/ve/test/conftest.py index e01ba3020..7f0b73825 100644 --- a/ocean_lib/models/ve/test/conftest.py +++ b/ocean_lib/models/ve/test/conftest.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import pytest diff --git a/ocean_lib/models/ve/test/test_smart_wallet_checker.py b/ocean_lib/models/ve/test/test_smart_wallet_checker.py index a7b7aafa4..a0d6d4b3e 100644 --- a/ocean_lib/models/ve/test/test_smart_wallet_checker.py +++ b/ocean_lib/models/ve/test/test_smart_wallet_checker.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import pytest diff --git a/ocean_lib/models/ve/test/test_ve_allocate.py b/ocean_lib/models/ve/test/test_ve_allocate.py index cdc792203..b92a2911d 100644 --- a/ocean_lib/models/ve/test/test_ve_allocate.py +++ b/ocean_lib/models/ve/test/test_ve_allocate.py @@ -1,13 +1,10 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # -import os - import brownie import pytest - accounts = None @@ -50,7 +47,7 @@ def test_batch_allocation(ve_allocate): nftaddr1 = accounts[0].address nftaddr2 = accounts[1].address - tx = ve_allocate.setBatchAllocation( + ve_allocate.setBatchAllocation( [50, 50], [nftaddr1, nftaddr2], [1, 1], {"from": accounts[0]} ) assert ve_allocate.getveAllocation(accounts[0], nftaddr1, 1) == 50 diff --git a/ocean_lib/models/ve/test/test_ve_delegation.py b/ocean_lib/models/ve/test/test_ve_delegation.py index 856462ca8..dfb585354 100644 --- a/ocean_lib/models/ve/test/test_ve_delegation.py +++ b/ocean_lib/models/ve/test/test_ve_delegation.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import pytest diff --git a/ocean_lib/models/ve/test/test_ve_delegation_proxy.py b/ocean_lib/models/ve/test/test_ve_delegation_proxy.py index e799b24df..5380a380b 100644 --- a/ocean_lib/models/ve/test/test_ve_delegation_proxy.py +++ b/ocean_lib/models/ve/test/test_ve_delegation_proxy.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import pytest diff --git a/ocean_lib/models/ve/test/test_ve_fee_distributor.py b/ocean_lib/models/ve/test/test_ve_fee_distributor.py index 4c39ca041..306f8ca34 100644 --- a/ocean_lib/models/ve/test/test_ve_fee_distributor.py +++ b/ocean_lib/models/ve/test/test_ve_fee_distributor.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import pytest diff --git a/ocean_lib/models/ve/test/test_ve_fee_estimate.py b/ocean_lib/models/ve/test/test_ve_fee_estimate.py index 7c6a96f9a..5a3b3b9b1 100644 --- a/ocean_lib/models/ve/test/test_ve_fee_estimate.py +++ b/ocean_lib/models/ve/test/test_ve_fee_estimate.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import pytest diff --git a/ocean_lib/models/ve/test/test_ve_ocean.py b/ocean_lib/models/ve/test/test_ve_ocean.py index 792fa4b32..9316296aa 100644 --- a/ocean_lib/models/ve/test/test_ve_ocean.py +++ b/ocean_lib/models/ve/test/test_ve_ocean.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import brownie diff --git a/ocean_lib/models/ve/ve_allocate.py b/ocean_lib/models/ve/ve_allocate.py index 7a2c81b9c..5abf16b6d 100644 --- a/ocean_lib/models/ve/ve_allocate.py +++ b/ocean_lib/models/ve/ve_allocate.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # from ocean_lib.web3_internal.contract_base import ContractBase diff --git a/ocean_lib/models/ve/ve_delegation.py b/ocean_lib/models/ve/ve_delegation.py index fe6070c0a..009e928de 100644 --- a/ocean_lib/models/ve/ve_delegation.py +++ b/ocean_lib/models/ve/ve_delegation.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # from ocean_lib.web3_internal.contract_base import ContractBase diff --git a/ocean_lib/models/ve/ve_delegation_proxy.py b/ocean_lib/models/ve/ve_delegation_proxy.py index fa5602faf..15430e7f6 100644 --- a/ocean_lib/models/ve/ve_delegation_proxy.py +++ b/ocean_lib/models/ve/ve_delegation_proxy.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # from ocean_lib.web3_internal.contract_base import ContractBase diff --git a/ocean_lib/models/ve/ve_fee_distributor.py b/ocean_lib/models/ve/ve_fee_distributor.py index 457e8dd6d..15eeb4eff 100644 --- a/ocean_lib/models/ve/ve_fee_distributor.py +++ b/ocean_lib/models/ve/ve_fee_distributor.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # from ocean_lib.web3_internal.contract_base import ContractBase diff --git a/ocean_lib/models/ve/ve_fee_estimate.py b/ocean_lib/models/ve/ve_fee_estimate.py index 345514d56..aa6fc7dff 100644 --- a/ocean_lib/models/ve/ve_fee_estimate.py +++ b/ocean_lib/models/ve/ve_fee_estimate.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # from ocean_lib.web3_internal.contract_base import ContractBase diff --git a/ocean_lib/models/ve/ve_ocean.py b/ocean_lib/models/ve/ve_ocean.py index c8df9270f..2f41cb497 100644 --- a/ocean_lib/models/ve/ve_ocean.py +++ b/ocean_lib/models/ve/ve_ocean.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # from ocean_lib.web3_internal.contract_base import ContractBase diff --git a/ocean_lib/ocean/__init__.py b/ocean_lib/ocean/__init__.py index b07ba3365..850b262f1 100644 --- a/ocean_lib/ocean/__init__.py +++ b/ocean_lib/ocean/__init__.py @@ -1,4 +1,4 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # diff --git a/ocean_lib/ocean/crypto.py b/ocean_lib/ocean/crypto.py index 5f6a8270d..8bf6f2e30 100644 --- a/ocean_lib/ocean/crypto.py +++ b/ocean_lib/ocean/crypto.py @@ -1,14 +1,17 @@ -# Copyright 2022 Ocean Protocol Foundation +# +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # from base64 import b64encode +from hashlib import sha256 + from cryptography.fernet import Fernet -from ecies import encrypt as asymmetric_encrypt, decrypt as asymmetric_decrypt +from ecies import decrypt as asymmetric_decrypt +from ecies import encrypt as asymmetric_encrypt from enforce_typing import enforce_types from eth_keys import keys from eth_utils import decode_hex -from hashlib import sha256 @enforce_types diff --git a/ocean_lib/ocean/mint_fake_ocean.py b/ocean_lib/ocean/mint_fake_ocean.py index 2746d3d16..7aebb09d8 100644 --- a/ocean_lib/ocean/mint_fake_ocean.py +++ b/ocean_lib/ocean/mint_fake_ocean.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import os diff --git a/ocean_lib/ocean/ocean.py b/ocean_lib/ocean/ocean.py index 6c2990054..02a7819ae 100644 --- a/ocean_lib/ocean/ocean.py +++ b/ocean_lib/ocean/ocean.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # diff --git a/ocean_lib/ocean/ocean_assets.py b/ocean_lib/ocean/ocean_assets.py index 09eac54c4..e8fee61a5 100644 --- a/ocean_lib/ocean/ocean_assets.py +++ b/ocean_lib/ocean/ocean_assets.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # @@ -47,7 +47,7 @@ SmartContractCall, UrlFile, ) -from ocean_lib.web3_internal.constants import MAX_UINT256, ZERO_ADDRESS +from ocean_lib.web3_internal.constants import ZERO_ADDRESS from ocean_lib.web3_internal.utils import check_network logger = logging.getLogger("ocean") @@ -341,7 +341,6 @@ def create_bundled( self._assert_ddo_metadata(metadata) name = metadata["name"] - cap = MAX_UINT256 data_nft_args = DataNFTArguments(name, name) if dt_template_index == 2: diff --git a/ocean_lib/ocean/ocean_compute.py b/ocean_lib/ocean/ocean_compute.py index be1a6b64c..6bb572b6f 100644 --- a/ocean_lib/ocean/ocean_compute.py +++ b/ocean_lib/ocean/ocean_compute.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import logging @@ -10,8 +10,8 @@ from ocean_lib.agreements.consumable import AssetNotConsumable, ConsumableCodes from ocean_lib.agreements.service_types import ServiceTypes from ocean_lib.aquarius import Aquarius -from ocean_lib.assets.ddo import DDO from ocean_lib.assets.asset_downloader import is_consumable +from ocean_lib.assets.ddo import DDO from ocean_lib.data_provider.data_service_provider import DataServiceProvider from ocean_lib.models.compute_input import ComputeInput from ocean_lib.services.service import Service diff --git a/ocean_lib/ocean/test/test_ocean.py b/ocean_lib/ocean/test/test_ocean.py index a509870a0..996a198e4 100644 --- a/ocean_lib/ocean/test/test_ocean.py +++ b/ocean_lib/ocean/test/test_ocean.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import pytest diff --git a/ocean_lib/ocean/test/test_ocean_assets.py b/ocean_lib/ocean/test/test_ocean_assets.py index 9aea5b473..9ef55bbdc 100644 --- a/ocean_lib/ocean/test/test_ocean_assets.py +++ b/ocean_lib/ocean/test/test_ocean_assets.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import copy diff --git a/ocean_lib/ocean/test/test_util.py b/ocean_lib/ocean/test/test_util.py index a28e55fb9..f958de404 100644 --- a/ocean_lib/ocean/test/test_util.py +++ b/ocean_lib/ocean/test/test_util.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # @@ -8,11 +8,11 @@ from ocean_lib.ocean import util from ocean_lib.ocean.util import ( + from_wei, get_address_of_type, get_ocean_token_address, - from_wei, - to_wei, str_with_wei, + to_wei, ) diff --git a/ocean_lib/ocean/util.py b/ocean_lib/ocean/util.py index 22b0fc678..8195bcfc6 100644 --- a/ocean_lib/ocean/util.py +++ b/ocean_lib/ocean/util.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import hashlib diff --git a/ocean_lib/services/consumer_parameters.py b/ocean_lib/services/consumer_parameters.py index 127af198c..1ec9a2e13 100644 --- a/ocean_lib/services/consumer_parameters.py +++ b/ocean_lib/services/consumer_parameters.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # """ diff --git a/ocean_lib/services/service.py b/ocean_lib/services/service.py index 367a0070c..e6ae315e4 100644 --- a/ocean_lib/services/service.py +++ b/ocean_lib/services/service.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # """ diff --git a/ocean_lib/services/test/test_consumer_parameters.py b/ocean_lib/services/test/test_consumer_parameters.py index a01e4ca34..2b7074a90 100644 --- a/ocean_lib/services/test/test_consumer_parameters.py +++ b/ocean_lib/services/test/test_consumer_parameters.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import pytest diff --git a/ocean_lib/services/test/test_service.py b/ocean_lib/services/test/test_service.py index 6db2bb117..5fa34341b 100644 --- a/ocean_lib/services/test/test_service.py +++ b/ocean_lib/services/test/test_service.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # from unittest.mock import Mock, patch diff --git a/ocean_lib/structures/abi_tuples.py b/ocean_lib/structures/abi_tuples.py index f1c2f6138..4e03ba3bf 100644 --- a/ocean_lib/structures/abi_tuples.py +++ b/ocean_lib/structures/abi_tuples.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # diff --git a/ocean_lib/structures/algorithm_metadata.py b/ocean_lib/structures/algorithm_metadata.py index 69571b997..1ca5c1236 100644 --- a/ocean_lib/structures/algorithm_metadata.py +++ b/ocean_lib/structures/algorithm_metadata.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import json diff --git a/ocean_lib/structures/file_objects.py b/ocean_lib/structures/file_objects.py index e07536368..2c27818b0 100644 --- a/ocean_lib/structures/file_objects.py +++ b/ocean_lib/structures/file_objects.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # from abc import abstractmethod diff --git a/ocean_lib/structures/test/test_algorithm_metadata.py b/ocean_lib/structures/test/test_algorithm_metadata.py index b6bd8218a..54b39c231 100644 --- a/ocean_lib/structures/test/test_algorithm_metadata.py +++ b/ocean_lib/structures/test/test_algorithm_metadata.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import json diff --git a/ocean_lib/structures/test/test_file_objects.py b/ocean_lib/structures/test/test_file_objects.py index 586021b00..2782fca31 100644 --- a/ocean_lib/structures/test/test_file_objects.py +++ b/ocean_lib/structures/test/test_file_objects.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import pytest diff --git a/ocean_lib/test/__init__.py b/ocean_lib/test/__init__.py index b07ba3365..850b262f1 100644 --- a/ocean_lib/test/__init__.py +++ b/ocean_lib/test/__init__.py @@ -1,4 +1,4 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # diff --git a/ocean_lib/test/test_config.py b/ocean_lib/test/test_config.py index 1248bf838..1be616a29 100644 --- a/ocean_lib/test/test_config.py +++ b/ocean_lib/test/test_config.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import json diff --git a/ocean_lib/test/test_example_config.py b/ocean_lib/test/test_example_config.py index d81419fd5..1e596ba4b 100644 --- a/ocean_lib/test/test_example_config.py +++ b/ocean_lib/test/test_example_config.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import pytest diff --git a/ocean_lib/web3_internal/__init__.py b/ocean_lib/web3_internal/__init__.py index b07ba3365..850b262f1 100644 --- a/ocean_lib/web3_internal/__init__.py +++ b/ocean_lib/web3_internal/__init__.py @@ -1,4 +1,4 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # diff --git a/ocean_lib/web3_internal/constants.py b/ocean_lib/web3_internal/constants.py index f7f9e3082..665a48018 100644 --- a/ocean_lib/web3_internal/constants.py +++ b/ocean_lib/web3_internal/constants.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # diff --git a/ocean_lib/web3_internal/contract_base.py b/ocean_lib/web3_internal/contract_base.py index c8f6d5a3d..1c59f8d90 100644 --- a/ocean_lib/web3_internal/contract_base.py +++ b/ocean_lib/web3_internal/contract_base.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # diff --git a/ocean_lib/web3_internal/contract_utils.py b/ocean_lib/web3_internal/contract_utils.py index fa6f0a5b0..97749d6f1 100644 --- a/ocean_lib/web3_internal/contract_utils.py +++ b/ocean_lib/web3_internal/contract_utils.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import json diff --git a/ocean_lib/web3_internal/test/__init__.py b/ocean_lib/web3_internal/test/__init__.py index b07ba3365..850b262f1 100644 --- a/ocean_lib/web3_internal/test/__init__.py +++ b/ocean_lib/web3_internal/test/__init__.py @@ -1,4 +1,4 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # diff --git a/ocean_lib/web3_internal/test/conftest.py b/ocean_lib/web3_internal/test/conftest.py index e17cae53b..2536b0e2c 100644 --- a/ocean_lib/web3_internal/test/conftest.py +++ b/ocean_lib/web3_internal/test/conftest.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # diff --git a/ocean_lib/web3_internal/test/test_contract_base.py b/ocean_lib/web3_internal/test/test_contract_base.py index e5ffaf899..08bf055e7 100644 --- a/ocean_lib/web3_internal/test/test_contract_base.py +++ b/ocean_lib/web3_internal/test/test_contract_base.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # diff --git a/ocean_lib/web3_internal/test/test_contract_utils.py b/ocean_lib/web3_internal/test/test_contract_utils.py index 8394030c8..f5942b515 100644 --- a/ocean_lib/web3_internal/test/test_contract_utils.py +++ b/ocean_lib/web3_internal/test/test_contract_utils.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # from web3.main import Web3 diff --git a/ocean_lib/web3_internal/test/test_wallet.py b/ocean_lib/web3_internal/test/test_wallet.py index a12687984..93fa18149 100644 --- a/ocean_lib/web3_internal/test/test_wallet.py +++ b/ocean_lib/web3_internal/test/test_wallet.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import os diff --git a/ocean_lib/web3_internal/utils.py b/ocean_lib/web3_internal/utils.py index e272178d6..10c65e8d3 100644 --- a/ocean_lib/web3_internal/utils.py +++ b/ocean_lib/web3_internal/utils.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import logging diff --git a/setup.py b/setup.py index 19c38b02f..fa4f73900 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # diff --git a/tests/__init__.py b/tests/__init__.py index b07ba3365..850b262f1 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,4 +1,4 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # diff --git a/tests/flows/__init__.py b/tests/flows/__init__.py index b07ba3365..850b262f1 100644 --- a/tests/flows/__init__.py +++ b/tests/flows/__init__.py @@ -1,4 +1,4 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # diff --git a/tests/flows/test_reuse_order_fees.py b/tests/flows/test_reuse_order_fees.py index 4e0bcabae..78332b87a 100644 --- a/tests/flows/test_reuse_order_fees.py +++ b/tests/flows/test_reuse_order_fees.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # from datetime import datetime, timedelta diff --git a/tests/flows/test_start_order_fees.py b/tests/flows/test_start_order_fees.py index 450e505f5..91eff7575 100644 --- a/tests/flows/test_start_order_fees.py +++ b/tests/flows/test_start_order_fees.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # from datetime import datetime, timedelta diff --git a/tests/generated-readmes/__init__.py b/tests/generated-readmes/__init__.py index b07ba3365..850b262f1 100644 --- a/tests/generated-readmes/__init__.py +++ b/tests/generated-readmes/__init__.py @@ -1,4 +1,4 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # diff --git a/tests/integration/ganache/test_compute_flow.py b/tests/integration/ganache/test_compute_flow.py index 8cf407801..02be44ee1 100644 --- a/tests/integration/ganache/test_compute_flow.py +++ b/tests/integration/ganache/test_compute_flow.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import time diff --git a/tests/integration/ganache/test_consume_flow.py b/tests/integration/ganache/test_consume_flow.py index 99203263c..eaaa1b751 100644 --- a/tests/integration/ganache/test_consume_flow.py +++ b/tests/integration/ganache/test_consume_flow.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import os diff --git a/tests/integration/ganache/test_disconnecting_components.py b/tests/integration/ganache/test_disconnecting_components.py index dd870b98d..f2d9f6cc9 100644 --- a/tests/integration/ganache/test_disconnecting_components.py +++ b/tests/integration/ganache/test_disconnecting_components.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import threading diff --git a/tests/integration/ganache/test_graphql.py b/tests/integration/ganache/test_graphql.py index 3a9325efb..a904c331d 100644 --- a/tests/integration/ganache/test_graphql.py +++ b/tests/integration/ganache/test_graphql.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import os diff --git a/tests/integration/ganache/test_market_flow.py b/tests/integration/ganache/test_market_flow.py index b76c7a731..2b06ba1f5 100644 --- a/tests/integration/ganache/test_market_flow.py +++ b/tests/integration/ganache/test_market_flow.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # diff --git a/tests/integration/ganache/test_onchain.py b/tests/integration/ganache/test_onchain.py index 00b0a2333..24fbd98a8 100644 --- a/tests/integration/ganache/test_onchain.py +++ b/tests/integration/ganache/test_onchain.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import os diff --git a/tests/integration/remote/test_mumbai_main.py b/tests/integration/remote/test_mumbai_main.py index 40e7d2881..07d22b3af 100644 --- a/tests/integration/remote/test_mumbai_main.py +++ b/tests/integration/remote/test_mumbai_main.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # from brownie.network import accounts diff --git a/tests/integration/remote/test_mumbai_readme.py b/tests/integration/remote/test_mumbai_readme.py index 76d41d0d1..9d92998cf 100644 --- a/tests/integration/remote/test_mumbai_readme.py +++ b/tests/integration/remote/test_mumbai_readme.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import pathlib diff --git a/tests/integration/remote/test_polygon.py b/tests/integration/remote/test_polygon.py index ece611b9d..ba3606ce2 100644 --- a/tests/integration/remote/test_polygon.py +++ b/tests/integration/remote/test_polygon.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import pytest diff --git a/tests/integration/remote/util.py b/tests/integration/remote/util.py index 48d60731a..f9c1bc999 100644 --- a/tests/integration/remote/util.py +++ b/tests/integration/remote/util.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import os @@ -9,11 +9,11 @@ import warnings import requests -from web3.exceptions import ExtraDataLengthError from brownie.exceptions import ContractNotFound, TransactionError, VirtualMachineError from brownie.network import accounts, chain from brownie.network.web3 import Web3 from enforce_typing import enforce_types +from web3.exceptions import ExtraDataLengthError ERRORS_TO_CATCH = ( ContractNotFound, diff --git a/tests/readmes/test_readmes.py b/tests/readmes/test_readmes.py index 07f1a41bd..7d05b93e7 100644 --- a/tests/readmes/test_readmes.py +++ b/tests/readmes/test_readmes.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import pathlib diff --git a/tests/resources/__init__.py b/tests/resources/__init__.py index b07ba3365..850b262f1 100644 --- a/tests/resources/__init__.py +++ b/tests/resources/__init__.py @@ -1,4 +1,4 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # diff --git a/tests/resources/ddo_helpers.py b/tests/resources/ddo_helpers.py index 80d1349c0..d66b34662 100644 --- a/tests/resources/ddo_helpers.py +++ b/tests/resources/ddo_helpers.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import json diff --git a/tests/resources/helper_functions.py b/tests/resources/helper_functions.py index 2869b13c3..a0262689c 100644 --- a/tests/resources/helper_functions.py +++ b/tests/resources/helper_functions.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import json diff --git a/tests/resources/mocks/__init__.py b/tests/resources/mocks/__init__.py index b07ba3365..850b262f1 100644 --- a/tests/resources/mocks/__init__.py +++ b/tests/resources/mocks/__init__.py @@ -1,4 +1,4 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # diff --git a/tests/resources/mocks/data_provider_mock.py b/tests/resources/mocks/data_provider_mock.py index 5a1ff8b0a..3320147e2 100644 --- a/tests/resources/mocks/data_provider_mock.py +++ b/tests/resources/mocks/data_provider_mock.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # diff --git a/tests/resources/mocks/http_client_mock.py b/tests/resources/mocks/http_client_mock.py index a836b1155..0620fbc26 100644 --- a/tests/resources/mocks/http_client_mock.py +++ b/tests/resources/mocks/http_client_mock.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Ocean Protocol Foundation +# Copyright 2023 Ocean Protocol Foundation # SPDX-License-Identifier: Apache-2.0 # import inspect