Nonce fixes.

oceanprotocol · Oct 25, 2023 · d644b33 · d644b33
1 parent 9419ffe
commit d644b33
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/ocean_lib/data_provider/base.py b/ocean_lib/data_provider/base.py
@@ -46,9 +46,7 @@ def set_http_client(http_client: Session) -> None:
 
     @staticmethod
     @enforce_types
-    def sign_message(
-        wallet, msg: str, provider_uri: Optional[str] = None
-    ) -> Tuple[str, str]:
+    def sign_message(wallet, msg: str, provider_uri: str) -> Tuple[str, str]:
         if provider_uri:
             method, nonce_endpoint = DataServiceProviderBase.build_endpoint(
                 "nonce", provider_uri

diff --git a/ocean_lib/data_provider/data_service_provider.py b/ocean_lib/data_provider/data_service_provider.py
@@ -6,11 +6,9 @@
 """Provider module."""
 import json
 import logging
-from datetime import datetime, timezone
 from json import JSONDecodeError
 from pathlib import Path
 from typing import Any, Dict, List, Optional, Union
-from unittest.mock import Mock
 
 from enforce_typing import enforce_types
 from requests.models import PreparedRequest, Response
@@ -345,6 +343,7 @@ def compute_job_result(
         nonce, signature = DataServiceProvider.sign_message(
             consumer,
             f"{consumer.address}{job_id}{str(index)}",
+            provider_uri=dataset_compute_service.service_endpoint,
         )
 
         req = PreparedRequest()
@@ -415,6 +414,7 @@ def _send_compute_request(
         nonce, signature = DataServiceProvider.sign_message(
             consumer,
             f"{consumer.address}{job_id}{did}",
+            provider_uri=service_endpoint,
         )
 
         req = PreparedRequest()
@@ -473,9 +473,12 @@ def _prepare_compute_payload(
                     _input, req_key
                 ), f"The received dataset does not have a {req_key}."
 
+        # TODO: is the nonce correct here?
+        # Should it be the one from the compute service or a dataset?
         nonce, signature = DataServiceProvider.sign_message(
             consumer,
             f"{consumer.address}{dataset.did}",
+            provider_uri=dataset.service.service_endpoint,
         )
 
         payload = {

diff --git a/tests/readmes/test_readmes.py b/tests/readmes/test_readmes.py
@@ -48,7 +48,7 @@ def test_script_execution(self, script_name):
             "publish-flow-credentials",
             "publish-flow-restapi",  # TODO: fix and restore
             "gas-strategy-remote",
-            # "using-clef", # TODO: removed original clef readme, to reinstate in #1461
+            "using-clef",  # TODO: removed original clef readme, to reinstate in #1461
         ]
 
         if script_name.replace("test_", "").replace(".py", "") in skippable: