From 91c1271bf4480e7ffc79764067955820f854b3a2 Mon Sep 17 00:00:00 2001 From: Maria Carmina <50501033+mariacarmina@users.noreply.github.com> Date: Thu, 28 Sep 2023 18:29:28 +0300 Subject: [PATCH] Add support for Sepolia. (#1482) * Add support for Sepolia. Test. Bump version v3.0.3 -> v3.0.4. * Delete test. --- .bumpversion.cfg | 2 +- ocean_lib/__init__.py | 2 +- ocean_lib/assets/ddo.py | 1 - ocean_lib/data_provider/data_service_provider.py | 2 -- ocean_lib/example_config.py | 1 + ocean_lib/models/datatoken_base.py | 1 - ocean_lib/models/test/test_data_nft.py | 1 - ocean_lib/models/test/test_exchange_main.py | 1 - ocean_lib/ocean/ocean.py | 2 -- ocean_lib/services/consumer_parameters.py | 1 - ocean_lib/test/test_example_config.py | 2 +- setup.py | 2 +- 12 files changed, 5 insertions(+), 13 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 08cbfe6ae..f803beb48 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.0.3 +current_version = 3.0.4 commit = True tag = True diff --git a/ocean_lib/__init__.py b/ocean_lib/__init__.py index d27f038a4..366cec783 100644 --- a/ocean_lib/__init__.py +++ b/ocean_lib/__init__.py @@ -7,5 +7,5 @@ __author__ = """OceanProtocol""" # fmt: off -__version__ = '3.0.3' +__version__ = '3.0.4' # fmt: on diff --git a/ocean_lib/assets/ddo.py b/ocean_lib/assets/ddo.py index 83db9ae91..a32170a5e 100644 --- a/ocean_lib/assets/ddo.py +++ b/ocean_lib/assets/ddo.py @@ -34,7 +34,6 @@ def __init__( event: Optional[dict] = None, stats: Optional[dict] = None, ) -> None: - self.did = did self.context = context or ["https://w3id.org/did/v1"] self.chain_id = chain_id diff --git a/ocean_lib/data_provider/data_service_provider.py b/ocean_lib/data_provider/data_service_provider.py index 3005dada4..e27807751 100644 --- a/ocean_lib/data_provider/data_service_provider.py +++ b/ocean_lib/data_provider/data_service_provider.py @@ -44,7 +44,6 @@ def initialize( consumer_address: str, userdata: Optional[Dict] = None, ) -> Response: - method, initialize_endpoint = DataServiceProvider.build_endpoint( "initialize", service.service_endpoint ) @@ -413,7 +412,6 @@ def compute_job_result_logs( def _send_compute_request( http_method: str, did: str, job_id: str, service_endpoint: str, consumer ) -> Dict[str, Any]: - nonce, signature = DataServiceProvider.sign_message( consumer, f"{consumer.address}{job_id}{did}", diff --git a/ocean_lib/example_config.py b/ocean_lib/example_config.py index dd89b4c3f..bd2f42fea 100644 --- a/ocean_lib/example_config.py +++ b/ocean_lib/example_config.py @@ -37,6 +37,7 @@ "moonriver": "https://v4.provider.moonriver.oceanprotocol.com", "moonbase": "https://v4.provider.moonbase.oceanprotocol.com", "mumbai": "https://v4.provider.mumbai.oceanprotocol.com", + "sepolia": "https://v4.provider.oceanprotocol.com", "development": DEFAULT_PROVIDER_URL, } diff --git a/ocean_lib/models/datatoken_base.py b/ocean_lib/models/datatoken_base.py index 3f47890ea..3b0162828 100644 --- a/ocean_lib/models/datatoken_base.py +++ b/ocean_lib/models/datatoken_base.py @@ -186,7 +186,6 @@ def start_order( tx_dict: dict, consume_market_fees=None, ) -> str: - if not consume_market_fees: consume_market_fees = TokenFeeInfo() diff --git a/ocean_lib/models/test/test_data_nft.py b/ocean_lib/models/test/test_data_nft.py index d839fea13..b085c2149 100644 --- a/ocean_lib/models/test/test_data_nft.py +++ b/ocean_lib/models/test/test_data_nft.py @@ -182,7 +182,6 @@ def test_permissions( def test_add_and_remove_permissions( publisher_wallet, consumer_wallet, config, data_nft ): - # Assert consumer has no permissions permissions = data_nft.getPermissions(consumer_wallet.address) assert not permissions[DataNFTPermissions.MANAGER] diff --git a/ocean_lib/models/test/test_exchange_main.py b/ocean_lib/models/test/test_exchange_main.py index 3c8694c29..c07d673f6 100644 --- a/ocean_lib/models/test/test_exchange_main.py +++ b/ocean_lib/models/test/test_exchange_main.py @@ -20,7 +20,6 @@ @pytest.mark.unit def test_with_defaults(OCEAN, DT, alice, bob): - # ========================================================================= # Create exchange exchange = DT.create_exchange( diff --git a/ocean_lib/ocean/ocean.py b/ocean_lib/ocean/ocean.py index 28962f5a3..7efa0adbc 100644 --- a/ocean_lib/ocean/ocean.py +++ b/ocean_lib/ocean/ocean.py @@ -177,7 +177,6 @@ def get_user_orders(self, address: str, datatoken: str) -> List[AttributeDict]: def retrieve_provider_fees( self, ddo: DDO, access_service: Service, publisher_wallet ) -> dict: - initialize_response = DataServiceProvider.initialize( ddo.did, access_service, consumer_address=publisher_wallet.address ) @@ -195,7 +194,6 @@ def retrieve_provider_fees_for_compute( compute_environment: str, valid_until: int, ) -> dict: - initialize_compute_response = DataServiceProvider.initialize_compute( [x.as_dictionary() for x in datasets], algorithm_data.as_dictionary(), diff --git a/ocean_lib/services/consumer_parameters.py b/ocean_lib/services/consumer_parameters.py index 1ec9a2e13..71d847ac3 100644 --- a/ocean_lib/services/consumer_parameters.py +++ b/ocean_lib/services/consumer_parameters.py @@ -27,7 +27,6 @@ def __init__( description: str, options: Optional[List[str]] = None, ) -> None: - fn_args = locals().copy() for attr_name in ConsumerParameters.required_attrs(): setattr(self, attr_name, fn_args[attr_name]) diff --git a/ocean_lib/test/test_example_config.py b/ocean_lib/test/test_example_config.py index 96f1a024a..542a7679f 100644 --- a/ocean_lib/test/test_example_config.py +++ b/ocean_lib/test/test_example_config.py @@ -57,7 +57,7 @@ def test_moonbeam_alpha_example_config(monkeypatch): @pytest.mark.unit -def test_get_address_of_type(monkeypatch): +def test_get_address_of_type(): config = get_config_dict("polygon") data_nft_factory = get_address_of_type(config, DataNFTFactoryContract.CONTRACT_NAME) diff --git a/setup.py b/setup.py index 7bbb330a8..e1f9f6208 100644 --- a/setup.py +++ b/setup.py @@ -89,7 +89,7 @@ url="https://github.com/oceanprotocol/ocean.py", # fmt: off # bumpversion.sh needs single-quotes - version='3.0.3', + version='3.0.4', # fmt: on zip_safe=False, )