ethernity-cloud-sdk-py 0.2.1__tar.gz → 0.2.3__tar.gz

{ethernity_cloud_sdk_py-0.2.1/ethernity_cloud_sdk_py.egg-info → ethernity_cloud_sdk_py-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ethernity-cloud-sdk-py
-Version: 0.2.1
+Version: 0.2.3
 Summary: Ethernity Cloud SDK Python
 Home-page: https://github.com/ethernity-cloud/ethernity-cloud-sdk-py
 Author: Ethernity Cloud Team
@@ -31,6 +31,7 @@ This project provides a set of tools and scripts to work with the Ethernity Clou
 
 ## Table of Contents
 
+- [Pre-requisites](#pre-requisites)
 - [Installation](#installation)
 - [Usage](#usage)
   - [Scripts](#scripts)
@@ -38,6 +39,22 @@ This project provides a set of tools and scripts to work with the Ethernity Clou
 - [Contributing](#contributing)
 - [License](#license)
 
+## Pre-requisites
+Linux:
+- build-essentials
+- Python 3.10+
+- docker 
+- docker-compose
+
+Windows:
+- Microsoft Visual Studio Community 2022+ (https://visualstudio.microsoft.com/)
+  - MSVC++ 14.3+ build tools
+  - C++ CMake tools for Windows
+  - Windows SDK (for current running version)
+  - Reboot required
+- Python 3.13
+- Docker Desktop
+
 ## Installation
 
 To install the package and its dependencies, run:
@@ -55,13 +72,6 @@ pip install ethernity-cloud-sdk-py
 
 After installation, you can use the provided scripts to build, publish, and initialize your project.
 
-## Pre-requisites
-The sdk requires the following to be installed on your system:
-- python 3.10+
-- docker (daemon running in the background for build and publish scripts)
-- docker-compose (for the build and publish scripts)
-
-
 ## Operating System compatibility
 The sdk has been tested on the following operating systems:
 - Windows 10

{ethernity_cloud_sdk_py-0.2.1 → ethernity_cloud_sdk_py-0.2.3}/README.md

@@ -13,6 +13,7 @@ This project provides a set of tools and scripts to work with the Ethernity Clou
 
 ## Table of Contents
 
+- [Pre-requisites](#pre-requisites)
 - [Installation](#installation)
 - [Usage](#usage)
   - [Scripts](#scripts)
@@ -20,6 +21,22 @@ This project provides a set of tools and scripts to work with the Ethernity Clou
 - [Contributing](#contributing)
 - [License](#license)
 
+## Pre-requisites
+Linux:
+- build-essentials
+- Python 3.10+
+- docker 
+- docker-compose
+
+Windows:
+- Microsoft Visual Studio Community 2022+ (https://visualstudio.microsoft.com/)
+  - MSVC++ 14.3+ build tools
+  - C++ CMake tools for Windows
+  - Windows SDK (for current running version)
+  - Reboot required
+- Python 3.13
+- Docker Desktop
+
 ## Installation
 
 To install the package and its dependencies, run:
@@ -37,13 +54,6 @@ pip install ethernity-cloud-sdk-py
 
 After installation, you can use the provided scripts to build, publish, and initialize your project.
 
-## Pre-requisites
-The sdk requires the following to be installed on your system:
-- python 3.10+
-- docker (daemon running in the background for build and publish scripts)
-- docker-compose (for the build and publish scripts)
-
-
 ## Operating System compatibility
 The sdk has been tested on the following operating systems:
 - Windows 10

{ethernity_cloud_sdk_py-0.2.1 → ethernity_cloud_sdk_py-0.2.3}/ethernity_cloud_sdk_py/commands/init.py

@@ -5,6 +5,7 @@ import subprocess
 import re
 from pathlib import Path
 from ethernity_cloud_sdk_py.commands.config import Config, config
+from ethernity_cloud_sdk_py.commands.pynithy.run.image_registry import ImageRegistry
 
 config = Config(Path(".config.json").resolve())
 config.load()
@@ -107,6 +108,10 @@ def main():
         docker_login = input("Enter Docker Login (username): ").strip()
         docker_password = input("Enter Password: ").strip()
         base_image_tag = input("Enter the image tag: ").strip()
+        config.write("BASE_IMAGE_TAG": dbase_image_tag)
+        config.write("DOCKER_REPO_URL": docker_repo_url)
+        config.write("DOCKER_LOGIN": docker_login)
+        config.write("DOCKER_PASSWORD": docker_password)
     print()
     blockchain_network_options = [
         "Bloxberg Mainnet",
@@ -124,10 +129,15 @@ def main():
     print(
         f"Checking if the project name (image name) is available on the {blockchain_network.replace(' ', '_')} network and ownership..."
     )
-    import ethernity_cloud_sdk_py.commands.pynithy.run.image_registry as image_registry
+
+    config.write("PROJECT_NAME", project_name)
+    config.write("SERVICE_TYPE", service_type)
+
+
+    image_registry = ImageRegistry()
 
     print(f"Running script image_registry...")
-    print(os.getcwd())
+    #print(os.getcwd())
   
     image_registry.main(
         blockchain_network.replace(" ", "_"),

ethernity_cloud_sdk_py-0.2.3/ethernity_cloud_sdk_py/commands/pynithy/build/securelock/Dockerfile

@@ -0,0 +1,51 @@
+FROM etny-securelock-serverless AS release
+
+COPY ./src/serverless/requirements.txt /requirements.txt
+RUN pip3 install -r /requirements.txt
+RUN rm -rf /requirements.txt
+
+ENV SECURELOCK_SESSION=ec_sdk_py_win_06_SECURELOCK_V3_testnet_96
+ENV BUCKET_NAME=etny-pynithy-testnet-v3
+ENV SMART_CONTRACT_ADDRESS=0x02882F03097fE8cD31afbdFbB5D72a498B41112c
+ENV IMAGE_REGISTRY_ADDRESS=0x15D73a742529C3fb11f3FA32EF7f0CC3870ACA31
+ENV RPC_URL=https://core.bloxberg.org
+ENV CHAIN_ID=8995
+ENV TRUSTED_ZONE_IMAGE=etny-pynithy-testnet
+
+RUN mkdir binary-fs-dir
+
+COPY ./src /etny-securelock/
+COPY ./scripts/* /etny-securelock/
+
+RUN /etny-securelock/binary-fs-build.sh
+
+FROM registry.ethernity.cloud:443/debuggingdelight/ethernity-cloud-sdk-registry/sconecuratedimages/crosscompilers AS build
+
+COPY --from=release /binary-fs-dir /.
+
+RUN scone gcc ./binary_fs_blob.s ./libbinary_fs_template.a -shared -o /libbinary-fs.so
+
+FROM etny-securelock-serverless
+
+COPY --from=build /usr/local/bin/scone /usr/local/bin/scone
+
+#RUN scone cas attest scone-cas.cf 3061b9feb7fa67f3815336a085f629a13f04b0a1667c93b14ff35581dc8271e4 -GCS --only_for_testing-debug --only_for_testing-ignore-signer
+
+COPY --from=build /libbinary-fs.so /lib/libbinary-fs.so
+
+RUN openssl genrsa -3 -out /enclave-key.pem 3072
+
+
+ENV SCONE_HEAP=3072M
+ENV SCONE_LOG=FATAL
+ENV SCONE_STACK=4M
+ENV SCONE_ALLOW_DLOPEN=1
+ENV SCONE_EXTENSIONS_PATH=/lib/libbinary-fs.so
+
+# Disabled production mode for testnet
+# RUN scone-signer sign --key=/enclave-key.pem --env --production /usr/local/bin/python3
+
+RUN rm -rf /enclave-key.pem
+
+
+ENTRYPOINT ["/usr/local/bin/python", "/etny-securelock/securelock.py"]

{ethernity_cloud_sdk_py-0.2.1 → ethernity_cloud_sdk_py-0.2.3}/ethernity_cloud_sdk_py/commands/pynithy/build/securelock/src/etny_exec.py

@@ -58,7 +58,7 @@ def Exec(payload_data, input_data, globals=None, locals=None):
                 else:
                     # Handle statements if needed
                     exec(
-                        compile(ast.Module([node]), filename="<ast>", mode="exec"),
+                        compile(ast.Module([node], type_ignores=[]), filename="<ast>", mode="exec"),
                         globals,
                         locals,
                     )

{ethernity_cloud_sdk_py-0.2.1 → ethernity_cloud_sdk_py-0.2.3}/ethernity_cloud_sdk_py/commands/pynithy/run/docker-compose-final.yml

@@ -24,7 +24,7 @@ services:
         environment:
           - SCONE_CAS_ADDR=scone-cas.cf
           - SCONE_LAS_ADDR=las
-          - SCONE_CONFIG_ID=ec_sdk_py_win_06_SECURELOCK_V3_testnet_90/application
+          - SCONE_CONFIG_ID=ec_sdk_py_win_06_SECURELOCK_V3_testnet_96/application
           - SCONE_HEAP=3072M
           - SCONE_LOG=FATAL
           - SCONE_STACK=4M

{ethernity_cloud_sdk_py-0.2.1 → ethernity_cloud_sdk_py-0.2.3}/ethernity_cloud_sdk_py/commands/pynithy/run/docker-compose.yml

@@ -23,7 +23,7 @@ services:
         environment:
           - SCONE_CAS_ADDR=scone-cas.cf
           - SCONE_LAS_ADDR=las
-          - SCONE_CONFIG_ID=ec_sdk_py_win_06_SECURELOCK_V3_testnet_90/application
+          - SCONE_CONFIG_ID=ec_sdk_py_win_06_SECURELOCK_V3_testnet_96/application
           - SCONE_HEAP=3072M
           - SCONE_LOG=FATAL
           - SCONE_STACK=4M

{ethernity_cloud_sdk_py-0.2.1 → ethernity_cloud_sdk_py-0.2.3}/ethernity_cloud_sdk_py/commands/pynithy/run/etny-securelock-test.yaml

@@ -1,4 +1,4 @@
-name: ec_sdk_py_win_06_SECURELOCK_V3_testnet_90
+name: ec_sdk_py_win_06_SECURELOCK_V3_testnet_96
 version: "0.3"
 
 
@@ -10,18 +10,18 @@ security:
 services:
    - name: application
      image_name: application_image
-     mrenclaves: [ "14c3735cad8b2463b3f5add95ba8584c50ad88a77de0b77688a4dbcfb2339bb4" ]
+     mrenclaves: [ "1692a58a38b80e3f94f0ab7f95d7129fd616546a7c039a3a89568fae3db52612" ]
      command: /usr/local/bin/python /etny-securelock/securelock.py
      pwd: /
 
 images:
    - name: application_image
      injection_files:
-       - path: /app/ec_sdk_py_win_06_SECURELOCK_V3_testnet_90/ca.pem
+       - path: /app/ec_sdk_py_win_06_SECURELOCK_V3_testnet_96/ca.pem
          content: $$SCONE::CA_CERT:crt$$
-       - path: /app/ec_sdk_py_win_06_SECURELOCK_V3_testnet_90/cert.pem
+       - path: /app/ec_sdk_py_win_06_SECURELOCK_V3_testnet_96/cert.pem
          content: $$SCONE::SERVER_CERT:crt$$
-       - path: /private/ec_sdk_py_win_06_SECURELOCK_V3_testnet_90/key.pem
+       - path: /private/ec_sdk_py_win_06_SECURELOCK_V3_testnet_96/key.pem
          content: $$SCONE::SERVER_CERT:privatekey$$
 
 secrets:

{ethernity_cloud_sdk_py-0.2.1 → ethernity_cloud_sdk_py-0.2.3}/ethernity_cloud_sdk_py/commands/pynithy/run/image_registry.py

@@ -18,9 +18,10 @@ config = Config(Path(".config.json").resolve())
 config.load()
 
 class ImageRegistry:
-    def __init__(self, private_key):
+    def __init__(self, private_key=None):
         try:
-            self.private_key = private_key
+            if private_key:
+                self.private_key = private_key
             self.blockchain_network = config.read("BLOCKCHAIN_NETWORK")
             self.project_name = config.read("PROJECT_NAME")
             self.enclave_name_securelock = self.project_name
@@ -64,14 +65,15 @@ class ImageRegistry:
             # if "Bloxberg" in BLOCKCHAIN_NETWORK or "Polygon" in BLOCKCHAIN_NETWORK:
             #     self.provider.middleware_onion.inject(geth_poa_middleware, layer=0)
 
-
-            self.acct = Account().from_key(self.private_key)
-            self.provider.eth.default_account = self.acct.address
+            if private_key:
+                self.acct = Account().from_key(self.private_key)
+                self.provider.eth.default_account = self.acct.address
 
             self.image_registry_contract = self.provider.eth.contract(
                 address=to_checksum_address(self.image_registry_address),
                 abi=self.image_registry_abi,
             )
+
         except Exception as e:
             raise Exception("Error initializing image registry: " + str(e))
 

{ethernity_cloud_sdk_py-0.2.1 → ethernity_cloud_sdk_py-0.2.3}/ethernity_cloud_sdk_py/commands/pynithy/run/predecessor.json

@@ -1,5 +1,5 @@
 {
-  "hash": "44037bdf3780cd0fdceaee663e8fc446771e53f1497047f0c730fbcd1849996a",
+  "hash": "687d26329c2869251d666f13f35b2240c246736fc05a39f3c7df5faf08836e11",
   "warnings": [
     [
       "0.3 is a legacy version. Please consider using 0.3.7 instead, unless you are targeting SCONE 5.7.0 or older"

{ethernity_cloud_sdk_py-0.2.1 → ethernity_cloud_sdk_py-0.2.3}/ethernity_cloud_sdk_py/templates/src/ethernity_task.py

@@ -1,32 +1,58 @@
 import os
-import sys
 import warnings
 import time
-from datetime import datetime
 from dotenv import load_dotenv
-
+import getpass
 warnings.filterwarnings("ignore")
 
-try:
-    load_dotenv(".env" if os.path.exists(".env") else ".env.config")
-except ImportError as e:
-    pass
 
 from ethernity_cloud_runner_py.runner import EthernityCloudRunner
+from ethernity_cloud_sdk_py.commands.private_key import PrivateKeyManager 
 
 code = "hello('World!')"
 
+def print_logs(runner):
+    previous_logs_count = 0
+    while runner.is_running():
+        state = runner.get_state()
+        current_logs = state['log']  # Assuming this is a list of logs in chronological order
+        
+        # Determine which logs are new based on how many logs we've seen before
+        new_logs = current_logs[previous_logs_count:]
+        
+        # Print the new logs in the order they appear
+        for log in new_logs:
+            print(log)
+        
+        # Update the count of previously seen logs
+        previous_logs_count = len(current_logs)
+
+        # Optional status prints
+        # print(f"{datetime.now()} Task status: {state['progress']}")
+        # print(f"Processed Events: {state['processed_events']}, Remaining Events: {state['remaining_events']}")
+
 def execute_task(code) -> None:
-    runner = EthernityCloudRunner()
-    runner.set_log_level("DEBUG")
 
-    runner.set_private_key(os.getenv("PRIVATE_KEY"))
+    load_dotenv(override=True)
+
+    while True:
+        try:
+            PASSWORD = getpass.getpass("Enter your private key password:")
+            ENC_PRIVATE_KEY = os.getenv("ENC_PRIVATE_KEY")
+            pkm = PrivateKeyManager(PASSWORD)
+            PRIVATE_KEY = pkm.decrypt_private_key(ENC_PRIVATE_KEY)
+            break
+        except Exception as e:
+            print("Incorrect password. Please try again.")
+            continue
+
+    runner = EthernityCloudRunner()
+    runner.set_log_level("INFO")
+    runner.set_private_key(PRIVATE_KEY)
     runner.set_network("Bloxberg", "Testnet")
     runner.set_storage_ipfs("https://ipfs.ethernity.cloud/api/v0")
-
     runner.connect()
 
-  
     resources = {
         "taskPrice": 3,
         "cpu": 4,
@@ -39,38 +65,21 @@ def execute_task(code) -> None:
 
     trustedzone_enclave = os.getenv("TRUSTED_ZONE_IMAGE")
     securelock_enclave = os.getenv("PROJECT_NAME")
+    securelock_version = os.getenv("VERSION")
     
     runner.run(
         resources,
         securelock_enclave,
+        securelock_version,
         code,
         "",
         trustedzone_enclave
     )
 
-    # Store previously printed logs
-    previous_logs = set()
-
     while runner.is_running():
-        state = runner.get_state()
-        current_logs = set(state['log'])  # Current set of logs
-
-        # Find new logs by subtracting previous_logs from current_logs
-        new_logs = current_logs - previous_logs
-
-        # If there are new logs, print them
-        if new_logs:
-            for log in new_logs:
-                print(log)
-        
-        # Update previous_logs to include the current logs
-        previous_logs = current_logs
-
-        # Optional status prints
-        # print(f"{datetime.now()} Task status: {state['progress']}")
-        # print(f"Processed Events: {state['processed_events']}, Remaining Events: {state['remaining_events']}")    
+        print_logs(runner)
+        time.sleep(0.1)
 
-    time.sleep(0.5)
     state = runner.get_state()
 
     if state['status'] == "ERROR":
@@ -83,4 +92,4 @@ def execute_task(code) -> None:
         print(result['value'])
 
 if __name__ == "__main__":
-    execute_task(code)
+    execute_task(code)

ethernity_cloud_sdk_py-0.2.3/ethernity_cloud_sdk_py/templates/src/serverless/Dockerfile.serverless

@@ -0,0 +1,7 @@
+FROM etny-securelock-base
+
+# add any docker commands to be included in the build process
+#
+# Example:
+# RUN apk update
+# RUN apk add gcc g++ git openblas-dev

ethernity_cloud_sdk_py-0.2.3/ethernity_cloud_sdk_py/templates/src/serverless/requirements.txt

@@ -0,0 +1,5 @@
+# Add requirements.txt file content to be included in the build process
+# Example:
+#
+# scipy
+# numpy

{ethernity_cloud_sdk_py-0.2.1 → ethernity_cloud_sdk_py-0.2.3/ethernity_cloud_sdk_py.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ethernity-cloud-sdk-py
-Version: 0.2.1
+Version: 0.2.3
 Summary: Ethernity Cloud SDK Python
 Home-page: https://github.com/ethernity-cloud/ethernity-cloud-sdk-py
 Author: Ethernity Cloud Team
@@ -31,6 +31,7 @@ This project provides a set of tools and scripts to work with the Ethernity Clou
 
 ## Table of Contents
 
+- [Pre-requisites](#pre-requisites)
 - [Installation](#installation)
 - [Usage](#usage)
   - [Scripts](#scripts)
@@ -38,6 +39,22 @@ This project provides a set of tools and scripts to work with the Ethernity Clou
 - [Contributing](#contributing)
 - [License](#license)
 
+## Pre-requisites
+Linux:
+- build-essentials
+- Python 3.10+
+- docker 
+- docker-compose
+
+Windows:
+- Microsoft Visual Studio Community 2022+ (https://visualstudio.microsoft.com/)
+  - MSVC++ 14.3+ build tools
+  - C++ CMake tools for Windows
+  - Windows SDK (for current running version)
+  - Reboot required
+- Python 3.13
+- Docker Desktop
+
 ## Installation
 
 To install the package and its dependencies, run:
@@ -55,13 +72,6 @@ pip install ethernity-cloud-sdk-py
 
 After installation, you can use the provided scripts to build, publish, and initialize your project.
 
-## Pre-requisites
-The sdk requires the following to be installed on your system:
-- python 3.10+
-- docker (daemon running in the background for build and publish scripts)
-- docker-compose (for the build and publish scripts)
-
-
 ## Operating System compatibility
 The sdk has been tested on the following operating systems:
 - Windows 10

{ethernity_cloud_sdk_py-0.2.1 → ethernity_cloud_sdk_py-0.2.3}/ethernity_cloud_sdk_py.egg-info/SOURCES.txt

@@ -33,6 +33,7 @@ ethernity_cloud_sdk_py/commands/pynithy/__pycache__/build.cpython-311.pyc
 ethernity_cloud_sdk_py/commands/pynithy/__pycache__/ipfs_client.cpython-311.pyc
 ethernity_cloud_sdk_py/commands/pynithy/__pycache__/publish.cpython-311.pyc
 ethernity_cloud_sdk_py/commands/pynithy/__pycache__/runner.cpython-311.pyc
+ethernity_cloud_sdk_py/commands/pynithy/build/securelock/Dockerfile
 ethernity_cloud_sdk_py/commands/pynithy/build/securelock/Dockerfile.base
 ethernity_cloud_sdk_py/commands/pynithy/build/securelock/Dockerfile.base.tpl
 ethernity_cloud_sdk_py/commands/pynithy/build/securelock/Dockerfile.tpl
@@ -78,7 +79,9 @@ ethernity_cloud_sdk_py/commands/pynithy/run/__pycache__/__init__.cpython-311.pyc
 ethernity_cloud_sdk_py/commands/pynithy/run/__pycache__/image_registry.cpython-311.pyc
 ethernity_cloud_sdk_py/commands/pynithy/run/__pycache__/public_key_service.cpython-311.pyc
 ethernity_cloud_sdk_py/templates/src/ethernity_task.py
+ethernity_cloud_sdk_py/templates/src/serverless/Dockerfile.serverless
 ethernity_cloud_sdk_py/templates/src/serverless/__init__.py
 ethernity_cloud_sdk_py/templates/src/serverless/backend.py
+ethernity_cloud_sdk_py/templates/src/serverless/requirements.txt
 tests/__init__.py
 tests/test_example.py

{ethernity_cloud_sdk_py-0.2.1 → ethernity_cloud_sdk_py-0.2.3}/setup.py

@@ -5,7 +5,7 @@ this_directory = Path(__file__).parent
 long_description = (this_directory / "README.md").read_text()
 setup(
     name="ethernity-cloud-sdk-py",
-    version="0.2.1",
+    version="0.2.3",
     url="https://github.com/ethernity-cloud/ethernity-cloud-sdk-py",
     author="Ethernity Cloud Team",
     author_email="contact@ethernity.cloud",