Merge pull request #430 from singnet/grpc_certificate_issue_fix

SNET-SDK/CLI | Adding root file as variable
singnet · Oct 6, 2021 · a66c3ac · a66c3ac
2 parents d1bb95a + a38dc60
commit a66c3ac
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 4,345 deletions.
diff --git a/packages/sdk/MANIFEST.in b/packages/sdk/MANIFEST.in
diff --git a/packages/sdk/setup.py b/packages/sdk/setup.py
@@ -40,7 +40,6 @@ def is_package_installed(package_name):
     version=version_dict['__version__'],
     packages=find_namespace_packages(include=['snet.*']),
     namespace_packages=['snet'],
-    include_package_data=True,
     url='https://github.com/singnet/snet-cli/tree/master/snet_sdk',
     license='MIT',
     author='SingularityNET Foundation',

diff --git a/packages/sdk/snet/sdk/root.pem b/packages/sdk/snet/sdk/root.pem
diff --git a/packages/sdk/snet/sdk/root_certificate.py b/packages/sdk/snet/sdk/root_certificate.py
diff --git a/packages/sdk/snet/sdk/service_client.py b/packages/sdk/snet/sdk/service_client.py
@@ -8,7 +8,7 @@
 from rfc3986 import urlparse
 from snet.sdk.mpe.payment_channel_provider import PaymentChannelProvider
 from snet.snet_cli.utils.utils import RESOURCES_PATH, add_to_path
-
+from snet.sdk.root_certificate import root_certificate
 
 class _ClientCallDetails(
     collections.namedtuple(
@@ -69,9 +69,7 @@ def _get_grpc_channel(self):
         if endpoint_object.scheme == "http":
             return grpc.insecure_channel(channel_endpoint)
         elif endpoint_object.scheme == "https":
-            with open('root.pem', 'rb') as f:
-                trusted_certs = f.read()
-            return grpc.secure_channel(channel_endpoint, grpc.ssl_channel_credentials(root_certificates=trusted_certs))
+            return grpc.secure_channel(channel_endpoint, grpc.ssl_channel_credentials(root_certificates=root_certificate))
         else:
             raise ValueError('Unsupported scheme in service metadata ("{}")'.format(endpoint_object.scheme))
 

diff --git a/packages/sdk/snet/sdk/version.py b/packages/sdk/snet/sdk/version.py
@@ -1 +1 @@
-__version__ = "v2.0.8"
+__version__ = "v2.0.9"
diff --git a/packages/snet_cli/snet/snet_cli/version.py b/packages/snet_cli/snet/snet_cli/version.py
@@ -1 +1 @@
-__version__ = "v2.0.6"
+__version__ = "v2.0.7"