@ethernity-cloud/sdk-js 1.7.8 → 1.7.10

package/run.js

@@ -4,8 +4,10 @@
  * The network-side sibling of `ecld-test`: same payload flags (a code string,
  * --file, --input/--input-text), but instead of executing locally it drives the
  * real runner (@ethernity-cloud/runner's EthernityCloudRunner) end to end —
- * encrypt the payload, push to IPFS, place the on-chain DO request, wait for a
- * node to process it, download and decrypt the result.
+ * encrypt the payload, place the on-chain DO request, deliver the payload to
+ * the bootnode's payload intake once the request is on chain (or to the IPFS
+ * API named with --ipfs <url>), wait for a node to process it, download and
+ * decrypt the result.
  *
  * Where ecld-test answers "does my CALL work?", ecld-run answers "does it work
  * on the network, on the enclave I published?" — it costs gas and needs a
@@ -41,8 +43,15 @@ const fs = require('fs');
 try { require('dotenv').config(); } catch (e) { /* dotenv optional */ }
 const casConfig = require('./cas/config.js');
 const { networkFor, unsafeVariant } = require('./network.js');
+const { PUBLIC_IPFS_HOST } = require('./localKubo.js');
 
-const DEFAULT_IPFS = 'https://ipfs.ethernity.cloud/api/v0';
+// `--ipfs intake` (the default): the artefacts' CIDs are computed locally and
+// the bytes delivered to the bootnode's payload intake once the DO request is
+// on chain (runner initializePublicIntake); `--ipfs <url>` uploads and reads
+// through that IPFS RPC API instead, with ECLD_IPFS_TOKEN or IPFS_TOKEN as its
+// Authorization header. The public API takes writes only with a writer token,
+// so a URL naming it is refused without one.
+const DEFAULT_IPFS = 'intake';
 
 function parseArgs(argv) {
   const opts = { ipfs: DEFAULT_IPFS, timeout: 600, taskPrice: 3, cpu: 1, memory: 1, storage: 10, bandwidth: 1, duration: 1, validators: 1, node: '' };
@@ -86,7 +95,9 @@ enclaves:  --securelock <name> (default PROJECT_NAME), --trustedzone <name> (def
            on an -unsafe network the default is each one's -unsafe variant
 key:       PRIVATE_KEY (a funded 0x key) from .env / env, or ECLD_PRIVATE_KEY
 resources: --task-price 3 --cpu 1 --memory 1 --storage 10 --bandwidth 1 --duration 1 --validators 1
-other:     --node <addr>  --ipfs <url>  --timeout <sec>  --json`;
+other:     --node <addr>  --ipfs intake|<ipfs api url> (default intake: the bootnode's payload intake;
+           a URL takes ECLD_IPFS_TOKEN or IPFS_TOKEN as its Authorization header)
+           --timeout <sec>  --json`;
 
 async function main() {
   const { opts, positional } = parseArgs(process.argv.slice(2));
@@ -173,7 +184,19 @@ async function main() {
     console.error('ecld-run: could not initialise the runner: ' + e.message);
     process.exit(1);
   }
-  runner.initializeStorage(opts.ipfs);
+  if (opts.ipfs === 'intake') {
+    runner.initializePublicIntake();
+  } else {
+    const token = (process.env.ECLD_IPFS_TOKEN || process.env.IPFS_TOKEN || '').trim();
+    let host = '';
+    try { host = new URL(opts.ipfs).hostname; } catch (e) { /* not a URL: the runner reports it */ }
+    if (host === PUBLIC_IPFS_HOST && !token) {
+      console.error(`ecld-run: the public API ${PUBLIC_IPFS_HOST} takes writes only with a writer token `
+        + '(ECLD_IPFS_TOKEN or IPFS_TOKEN); use the intake (--ipfs intake) or your own Kubo.');
+      process.exit(2);
+    }
+    runner.initializeStorage(opts.ipfs, undefined, undefined, token || undefined);
+  }
 
   let lastPhase = null;
   const onProgress = (e) => {

package/nodenithy/ipfs.js

@@ -1,135 +0,0 @@
-import { create } from 'ipfs-http-client';
-import { delay, getRetryDelay } from './utils';
-import { ECError } from './enums';
-
-let ipfs = null;
-const writeFile = promisify(fs.writeFile);
-
-export const initialize = (host, protocol, port, token) => {
-  if (host.search('http') !== -1) {
-    ipfs = create(host);
-  } else if (token === '') {
-    ipfs = create({
-      host,
-      protocol,
-      port
-    });
-  } else {
-    // example of authorization headers
-    // headers: {
-    //     authorization: 'Bearer ' + TOKEN
-    //   }
-    // const auth =
-    //     'Basic ' + Buffer.from(INFURA_ID + ':' + INFURA_SECRET_KEY).toString('base64');
-    ipfs = create({
-      host,
-      protocol,
-      port,
-      headers: { authorization: token }
-    });
-  }
-};
-
-export const uploadToIPFS = async (code) => {
-  try {
-    const response = await ipfs.add(code);
-    return response.path;
-  } catch (e) {
-    console.log(e);
-    return null;
-  }
-};
-
-export const uploadFileToIPFS = async (path) => {
-  try {
-    const response = await ipfs.add(path);
-    return response.path;
-  } catch (e) {
-    console.log(e);
-    return null;
-  }
-};
-
-export const uploadFolderToIPFS = async (path) => {
-  try {
-    const response = await ipfs.add(path, { recursive: true });
-    return response.path;
-  } catch (e) {
-    console.log(e);
-    return null;
-  }
-};
-
-// export const getFromIPFS = async (hash) => {
-//   let res = '';
-//   try {
-//     // eslint-disable-next-line no-restricted-syntax
-//     for await (const file of ipfs.cat(hash)) {
-//       res += new TextDecoder().decode(file.buffer);
-//     }
-//
-//     return res;
-//   } catch (error) {
-//     console.error(error.message);
-//     await delay(2000);
-//     return getFromIPFS(hash);
-//   }
-// };
-
-export const getFromIPFS = async (hash, filePath, maxRetries = process.env.REACT_APP_IPFS_RETRIES || 5) => {
-  let res = '';
-  let retryCount = 0;
-
-  while (retryCount < maxRetries) {
-    try {
-      // eslint-disable-next-line no-restricted-syntax,no-await-in-loop
-      for await (const file of ipfs.cat(hash)) {
-        res += new TextDecoder().decode(file.buffer);
-      }
-
-      // Save the content to a file
-      await writeFile(filePath, res);
-      return res;
-    } catch (error) {
-      console.error(error.message);
-      retryCount += 1;
-
-      if (retryCount < maxRetries) {
-        // eslint-disable-next-line no-await-in-loop
-        await delay(getRetryDelay(retryCount));
-        // eslint-disable-next-line no-continue
-        continue;
-      } else {
-        throw new Error(ECError.IPFS_DOWNLOAD_ERROR);
-      }
-    }
-  }
-};
-
-export const getContentFromIPFS = async (hash, maxRetries = process.env.REACT_APP_IPFS_RETRIES || 5) => {
-  let res = '';
-  let retryCount = 0;
-
-  while (retryCount < maxRetries) {
-    try {
-      // eslint-disable-next-line no-restricted-syntax,no-await-in-loop
-      for await (const file of ipfs.cat(hash)) {
-        res += new TextDecoder().decode(file.buffer);
-      }
-
-      return res;
-    } catch (error) {
-      console.error(error.message);
-      retryCount += 1;
-
-      if (retryCount < maxRetries) {
-        // eslint-disable-next-line no-await-in-loop
-        await delay(getRetryDelay(retryCount));
-        // eslint-disable-next-line no-continue
-        continue;
-      } else {
-        throw new Error(ECError.IPFS_DOWNLOAD_ERROR);
-      }
-    }
-  }
-};

package/nodenithy/run/git.sh

@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# apk add git
-
-# ls -la
-
-# echo "${REGISTRY_PATH}"
-# cd ${REGISTRY_PATH}
-
-# ls -la
-
-# #commit add all to git
-# ls -la ${CI_PROJECT_DIR}/etny-hash-packages/etny-nodenithy/v3/
-# echo "Adding changed files to GIT: IPFS_HASH, IPFS_DOCKER_COMPOSE_HASH, CERTIFICATE..."
-# git -C ${CI_PROJECT_DIR}/etny-hash-packages add etny-nodenithy/v3/.
-# echo "Committed all files"
-# git -C ${CI_PROJECT_DIR}/etny-hash-packages commit -m 'Adding changed files to GIT: IPFS_HASH, IPFS_DOCKER_COMPOSE_HASH, CERTIFICATE'
-# echo "Pushed all files"
-# git -C ${CI_PROJECT_DIR}/etny-hash-packages push
-# echo "Added and committed all files"
-# cd -
-

package/nodenithy/run/ipfs.sh

@@ -1,58 +0,0 @@
-#!/bin/bash
-
-export IPFS_HOME=${PWD}/ipfs
-export IPFS_PATH=${IPFS_HOME}/.ipfs
-
-export KUBO_URL="https://github.com/ipfs/kubo/releases/download/v0.17.0/kubo_v0.17.0_darwin-amd64.tar.gz"
-echo KUBO_URL=${KUBO_URL}
-
-mkdir -p ${IPFS_HOME}
-
-curl -L ${KUBO_URL} | tar xvz
-
-echo "*** KUBO Downloaded ***"
-
-if [ -d "${IPFS_PATH}" ]; then
-  killall ipfs
-  rm -fr ${IPFS_PATH}
-fi
-
-export IPFS_CMD=${PWD}/kubo/ipfs
-export REGISTRY_PATH=../../../../registry
-
-${IPFS_CMD} init
-
-sleep 20
-
-${IPFS_CMD} daemon &
-
-sleep 20
-
-${IPFS_CMD} swarm connect /ip4/31.7.188.59/tcp/4001/ipfs/QmRBc1eBt4hpJQUqHqn6eA8ixQPD3LFcUDsn6coKBQtia5
-${IPFS_CMD} bootstrap add /ip4/31.7.188.59/tcp/4001/ipfs/QmRBc1eBt4hpJQUqHqn6eA8ixQPD3LFcUDsn6coKBQtia5
-
-
-cp certificate.securelock.crt "${REGISTRY_PATH}/certificate.securelock.crt"
-cp certificate.trustedzone.crt "${REGISTRY_PATH}/certificate.trustedzone.crt"
-echo "${REGISTRY_PATH}"
-cd ${REGISTRY_PATH}
-
-#ADDING DOCKER IMAGE hash
-export IPFS_HASH=$(${IPFS_CMD} add . -r | grep added | tail -1 | awk '{print $2}')
-echo "IPFS_HASH=${IPFS_HASH}"
-
-echo ipfs pin add --progress ${IPFS_HASH}
-${IPFS_CMD} pin add --progress ${IPFS_HASH}
-
-#DOWNLOADING DOCKER IMAGE FROM IFPS HASH
-echo ipfs get  ${IPFS_HASH}
-${IPFS_CMD} get  ${IPFS_HASH}
-
-if [ -d "${IPFS_PATH}" ]; then
-  killall ipfs
-  rm -fr ${IPFS_PATH}
-fi
-
-cd -
-
-echo "${IPFS_HASH}" > "IPFS_HASH.ipfs"

package/nodenithy/run/ipfs_pre.sh

@@ -1,75 +0,0 @@
-#!/bin/bash
-
-export IPFS_HOME=${PWD}/ipfs
-export IPFS_PATH=${IPFS_HOME}/.ipfs
-
-export KUBO_URL="https://github.com/ipfs/kubo/releases/download/v0.17.0/kubo_v0.17.0_darwin-amd64.tar.gz"
-echo KUBO_URL=${KUBO_URL}
-
-mkdir -p ${IPFS_HOME}
-
-curl -L ${KUBO_URL} | tar xvz
-
-echo "*** KUBO Downloaded ***"
-
-if [ -d "${IPFS_PATH}" ]; then
-  killall ipfs
-  rm -fr ${IPFS_PATH}
-fi
-
-export IPFS_CMD=${PWD}/kubo/ipfs
-export REGISTRY_PATH=../../../../registry
-
-${IPFS_CMD} init
-
-sleep 20
-
-# Configure Kubo to use the custom IPFS API endpoint
-${IPFS_CMD} config Addresses.API /ip4/127.0.0.1/tcp/5001
-${IPFS_CMD} config --json API.HTTPHeaders.Access-Control-Allow-Origin '["*"]'
-${IPFS_CMD} config --json API.HTTPHeaders.Access-Control-Allow-Methods '["PUT", "POST", "GET"]'
-
-${IPFS_CMD} daemon &
-
-sleep 20
-
-# Connect to the custom IPFS node
-${IPFS_CMD} swarm connect /dns4/ipfs.ethernity.cloud/tcp/5001
-
-# Adding Docker Compose hash
-export IPFS_DOCKER_COMPOSE_HASH=$(${IPFS_CMD} add docker-compose-final.yml | grep added | tail -1 | awk '{print $2}')
-echo "IPFS_DOCKER_COMPOSE_HASH=${IPFS_DOCKER_COMPOSE_HASH}"
-
-echo ipfs pin add --progress ${IPFS_DOCKER_COMPOSE_HASH}
-${IPFS_CMD} pin add --progress ${IPFS_DOCKER_COMPOSE_HASH}
-
-# Downloading Docker Compose from IPFS hash
-echo ipfs get ${IPFS_DOCKER_COMPOSE_HASH}
-${IPFS_CMD} get ${IPFS_DOCKER_COMPOSE_HASH}
-
-# Remove downloaded
-rm -fr ${IPFS_DOCKER_COMPOSE_HASH}
-
-echo "${REGISTRY_PATH}"
-cd ${REGISTRY_PATH}
-
-# Adding Docker image hash
-export IPFS_HASH=$(${IPFS_CMD} add . -r | grep added | tail -1 | awk '{print $2}')
-echo "IPFS_HASH=${IPFS_HASH}"
-
-echo ipfs pin add --progress ${IPFS_HASH}
-${IPFS_CMD} pin add --progress ${IPFS_HASH}
-
-# Downloading Docker image from IPFS hash
-echo ipfs get ${IPFS_HASH}
-${IPFS_CMD} get ${IPFS_HASH}
-
-if [ -d "${IPFS_PATH}" ]; then
-  killall ipfs
-  rm -fr ${IPFS_PATH}
-fi
-
-cd -
-
-echo "${IPFS_DOCKER_COMPOSE_HASH}" > "IPFS_DOCKER_COMPOSE_HASH.ipfs"
-echo "${IPFS_HASH}" > "IPFS_HASH.ipfs"

package/nodenithy/run.sh

@@ -1,277 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Source environment variables
-if [ -f .env ]; then
-    source .env
-else
-    echo "Error: .env file not found"
-    exit 1
-fi
-
-write_env() {
-    local key=$1
-    local value=$2
-    local env_file="$current_dir/.env"
-
-    # Check if the .env file exists
-    if [[ -f $env_file ]]; then
-        # Check if the key exists in the .env file
-        if grep -q "^${key}=" "$env_file"; then
-            # Update the existing key with the new value
-            sed -i '' "s/^${key}=.*/${key}=${value}/" "$env_file"
-        else
-            # Add the new key-value pair to the .env file
-            echo "${key}=${value}" >> "$env_file"
-        fi
-    else
-        # Create the .env file and add the key-value pair
-        echo "${key}=${value}" > "$env_file"
-    fi
-}
-
-current_dir=$(pwd)
-echo "current_dir: $current_dir"
-
-# Set up local registry path
-export REGISTRY_PATH=${PWD}/registry
-
-
-# check for sgx compatible machine
-# check if image name is available in smart contract
-
-
-RUNNER_TYPE="nodenithy"
-echo "VERSION = ${VERSION}"
-
-cd ${PWD}/node_modules/ethernity-cloud-sdk-js/nodenithy/run
-
-echo "ETNY MODE: ${ETNY_MODE}"
-
-# Determine MRENCLAVE values
-export MRENCLAVE_SECURELOCK=$(docker-compose run -e SCONE_LOG=INFO -e SCONE_HASH=1 etny-securelock | grep -v Creating | grep -v Pulling | grep -v latest | grep -v Digest | tr -d '\r')
-export MRENCLAVE_TRUSTEDZONE=$(docker-compose run -e SCONE_LOG=INFO -e SCONE_HASH=1 etny-trustedzone | grep -v Creating | grep -v Pulling | grep -v latest | grep -v Digest | tr -d '\r')
-export MRENCLAVE_VALIDATOR=$(docker-compose run -e SCONE_LOG=INFO -e SCONE_HASH=1 etny-validator | grep -v Creating | grep -v Pulling | grep -v latest | grep -v Digest | tr -d '\r')
-
-echo "MRENCLAVE_SECURELOCK: ${MRENCLAVE_SECURELOCK}"
-echo "MRENCLAVE_TRUSTEDZONE: ${MRENCLAVE_TRUSTEDZONE}"
-echo "MRENCLAVE_VALIDATOR: ${MRENCLAVE_VALIDATOR}"
-
-write_env "MRENCLAVE_SECURELOCK" "${MRENCLAVE_SECURELOCK}"
-write_env "MRENCLAVE_TRUSTEDZONE" "${MRENCLAVE_TRUSTEDZONE}"
-write_env "MRENCLAVE_VALIDATOR" "${MRENCLAVE_VALIDATOR}"
-
-export CI_COMMIT_BRANCH = ${PROJECT_NAME}
-# Generate enclave names
-ENCLAVE_NAME_SECURELOCK=$(echo ${ENCLAVE_NAME_SECURELOCK} | awk '{print toupper($0)}' | sed 's#/#_#g' | sed 's#-#_#g')
-PREDECESSOR_NAME_SECURELOCK=$(echo PREDECESSOR_SECURELOCK_${VERSION}_${CI_COMMIT_BRANCH} | awk '{print toupper($0)}' | sed 's#/#_#g' | sed 's#-#_#g')
-
-echo
-echo "ENCLAVE_NAME_SECURELOCK: ${ENCLAVE_NAME_SECURELOCK}"
-echo "PREDECESSOR_NAME_SECURELOCK: ${PREDECESSOR_NAME_SECURELOCK}"
-write_env "PREDECESSOR_NAME_SECURELOCK" "${PREDECESSOR_NAME_SECURELOCK}"
-echo
-
-export ENCLAVE_NAME_SECURELOCK
-# write_env "ENCLAVE_NAME_SECURELOCK" "${ENCLAVE_NAME_SECURELOCK}"
-
-PREDECESSOR_HASH_SECURELOCK=$(eval "echo \${$PREDECESSOR_NAME_SECURELOCK}")
-
-# Set default values only if environment variables are not set
-PREDECESSOR_HASH_SECURELOCK=${PREDECESSOR_HASH_SECURELOCK:-"EMPTY"}
-
-# Debug: Print environment variables
-echo "PREDECESSOR_HASH_SECURELOCK: ${PREDECESSOR_HASH_SECURELOCK}"
-echo "MRENCLAVE_SECURELOCK: ${MRENCLAVE_SECURELOCK}"
-echo "ENCLAVE_NAME_SECURELOCK: ${ENCLAVE_NAME_SECURELOCK}"
-
-# Process etny-securelock-test.yaml
-if [ ! -f etny-securelock-test.yaml.tpl ]; then
-    echo "Error: Template file etny-securelock-test.yaml.tpl not found!"
-    exit 1
-fi
-
-if [ "${PREDECESSOR_HASH_SECURELOCK}" = "EMPTY" ]; then
-    sed -e "s|__PREDECESSOR__ |#predecessor: ${PREDECESSOR_HASH_SECURELOCK}|g" \
-        -e "s|__MRENCLAVE__|${MRENCLAVE_SECURELOCK}|g" \
-        -e "s|__ENCLAVE_NAME__|${ENCLAVE_NAME_SECURELOCK}|g" \
-        etny-securelock-test.yaml.tpl > etny-securelock-test.yaml
-else
-    sed -e "s|__PREDECESSOR__|predecessor: ${PREDECESSOR_HASH_SECURELOCK}|g" \
-        -e "s|__MRENCLAVE__|${MRENCLAVE_SECURELOCK}|g" \
-        -e "s|__ENCLAVE_NAME__|${ENCLAVE_NAME_SECURELOCK}|g" \
-        etny-securelock-test.yaml.tpl > etny-securelock-test.yaml
-fi
-
-echo "Contents of etny-securelock-test.yaml:"
-cat etny-securelock-test.yaml
-
-echo "Checking for remaining placeholders:"
-grep -n "__.*__" etny-securelock-test.yaml || echo "No placeholders found."
-
-echo "##############################################################################################################"
-
-ENCLAVE_NAME_TRUSTEDZONE=$(echo ${ENCLAVE_NAME_TRUSTEDZONE} | awk '{print toupper($0)}' | sed 's#/#_#g' | sed 's#-#_#g')
-PREDECESSOR_NAME_TRUSTEDZONE=$(echo PREDECESSOR_TRUSTEDZONE_${VERSION}_${CI_COMMIT_BRANCH} | awk '{print toupper($0)}' | sed 's#/#_#g' | sed 's#-#_#g')
-
-echo
-echo "ENCLAVE_NAME_TRUSTEDZONE: ${ENCLAVE_NAME_TRUSTEDZONE}"
-echo "PREDECESSOR_NAME_TRUSTEDZONE: ${PREDECESSOR_NAME_TRUSTEDZONE}"
-echo
-
-export ENCLAVE_NAME_TRUSTEDZONE
-# write_env "ENCLAVE_NAME_TRUSTEDZONE" "${ENCLAVE_NAME_TRUSTEDZONE}"
-
-PREDECESSOR_HASH_TRUSTEDZONE=$(eval "echo \${$PREDECESSOR_NAME_TRUSTEDZONE}")
-PREDECESSOR_HASH_TRUSTEDZONE=${PREDECESSOR_HASH_TRUSTEDZONE:-"EMPTY"}
-
-# Debug: Print environment variables
-echo "PREDECESSOR_HASH_TRUSTEDZONE: ${PREDECESSOR_HASH_TRUSTEDZONE}"
-echo "MRENCLAVE_TRUSTEDZONE: ${MRENCLAVE_TRUSTEDZONE}"
-echo "MRENCLAVE_VALIDATOR: ${MRENCLAVE_VALIDATOR}"
-echo "ENCLAVE_NAME_TRUSTEDZONE: ${ENCLAVE_NAME_TRUSTEDZONE}"
-
-# Process etny-trustedzone-test.yaml
-if [ ! -f etny-trustedzone-test.yaml.tpl ]; then
-    echo "Error: Template file etny-trustedzone-test.yaml.tpl not found!"
-    exit 1
-fi
-
-if [ "${PREDECESSOR_HASH_TRUSTEDZONE}" = "EMPTY" ]; then
-    sed -e "s|__PREDECESSOR__|# predecessor: ${PREDECESSOR_HASH_TRUSTEDZONE}|g" \
-        -e "s|__MRENCLAVE__|${MRENCLAVE_TRUSTEDZONE}|g" \
-        -e "s|__MRENCLAVE_VALIDATOR__|${MRENCLAVE_VALIDATOR}|g" \
-        -e "s|__ENCLAVE_NAME__|${ENCLAVE_NAME_TRUSTEDZONE}|g" \
-        etny-trustedzone-test.yaml.tpl > etny-trustedzone-test.yaml
-else
-    sed -e "s|__PREDECESSOR__|predecessor: ${PREDECESSOR_HASH_TRUSTEDZONE}|g" \
-        -e "s|__MRENCLAVE__|${MRENCLAVE_TRUSTEDZONE}|g" \
-        -e "s|__MRENCLAVE_VALIDATOR__|${MRENCLAVE_VALIDATOR}|g" \
-        -e "s|__ENCLAVE_NAME__|${ENCLAVE_NAME_TRUSTEDZONE}|g" \
-        etny-trustedzone-test.yaml.tpl > etny-trustedzone-test.yaml
-fi
-
-echo "Contents of etny-trustedzone-test.yaml:"
-cat etny-trustedzone-test.yaml
-
-echo "Checking for remaining placeholders:"
-grep -n "__.*__" etny-trustedzone-test.yaml || echo "No placeholders found."
-
-echo "# Update docker-compose files"
-
-# Update docker-compose files
-for file in docker-compose.yml docker-compose-final.yml; do
-    if [ ! -f "$file" ]; then
-        echo "Error: $file not found!"
-        continue
-    fi
-
-    echo "Processing $file"
-    echo "ENCLAVE_NAME_SECURELOCK: ${ENCLAVE_NAME_SECURELOCK}"
-    echo "ENCLAVE_NAME_TRUSTEDZONE: ${ENCLAVE_NAME_TRUSTEDZONE}"
-
-    echo "Checking for placeholders before replacement:"
-    grep "__ENCLAVE_NAME_SECURELOCK__" "$file" || echo "No __ENCLAVE_NAME_SECURELOCK__ found in $file"
-    grep "__ENCLAVE_NAME_TRUSTEDZONE__" "$file" || echo "No __ENCLAVE_NAME_TRUSTEDZONE__ found in $file"
-
-    sed -i '' -e "s|__ENCLAVE_NAME_SECURELOCK__|${ENCLAVE_NAME_SECURELOCK}|g" \
-              -e "s|__ENCLAVE_NAME_TRUSTEDZONE__|${ENCLAVE_NAME_TRUSTEDZONE}|g" \
-              "$file"
-
-    echo "Checking for placeholders after replacement:"
-    grep "__ENCLAVE_NAME_SECURELOCK__" "$file" || echo "No __ENCLAVE_NAME_SECURELOCK__ found in $file"
-    grep "__ENCLAVE_NAME_TRUSTEDZONE__" "$file" || echo "No __ENCLAVE_NAME_TRUSTEDZONE__ found in $file"
-
-    echo "Contents of $file:"
-    cat "$file"
-    echo
-done
-
-# export binaries hashes from scontain base image (node/python)
-# use them allong with the ipfs hash of the uploaded registry artefact
-
-# Get PUBLIC_KEY for SECURELOCK
-export PUBLIC_KEY_SECURELOCK_RES=$(docker-compose run etny-securelock | grep -v Creating | grep -v Pulling | grep -v latest | grep -v Digest | sed 's/.*PUBLIC_KEY:\s*//' | tr -d '\r')
-
-echo "PUBLIC_KEY_SECURELOCK_RES: ${PUBLIC_KEY_SECURELOCK_RES}"
-
-
-# Check if PUBLIC_KEY_SECURELOCK_RES is empty
-if [ -z "${PUBLIC_KEY_SECURELOCK_RES}" ]; then
-  echo
-  echo
-  echo "It seams that your machine is not SGX compatible."
-  echo
-  echo "Do you want to continue by generating the necesary certificates using the Ethernity Cloud signing service? (yes/no)"
-    read -p "Select an option (default is no): " REPLY
-    if [[ -z "$REPLY" ]]; then
-        echo "No option selected. Exiting."
-        exit 1
-    elif [[ "$REPLY" == "yes" ]]; then
-        echo
-        echo "Generating certificates using the Ethernity Cloud signing service..."
-        echo
-        echo "**** Started ipfs initial pining ****"
-        if [ -f ipfs.sh ]; then
-            chmod +x ipfs_pre.sh
-            ./ipfs_pre.sh
-        else
-            echo "Warning: ipfs_pre.sh not found. Skipping IPFS setup."
-        fi
-        echo "**** Finished ipfs initial pining ****"
-        echo "ENCLAVE_NAME_SECURELOCK: ${ENCLAVE_NAME_SECURELOCK}"
-        echo "VERSION: ${VERSION}"
-        echo "BLOCKCHAIN_NETWORK: ${BLOCKCHAIN_NETWORK}"
-        python3 ./public_key_service.py --enclave_name "${PROJECT_NAME}" --protocol_version "${VERSION}" --network "${BLOCKCHAIN_NETWORK}" --template_version "0.1.12"
-        # read PUBLIC_KEY_SECURELOCK_RES from PUBLIC_KEY.txt
-        PUBLIC_KEY_SECURELOCK_RES=$(cat PUBLIC_KEY.txt)
-    else
-        echo "Exiting."
-        exit 1
-    fi
-fi
-
-export CERTIFICATE_CONTENT_SECURELOCK=$(echo "${PUBLIC_KEY_SECURELOCK_RES}" | sed -n '/-----BEGIN CERTIFICATE-----/,/-----END CERTIFICATE-----/p' | sed -e '/-----BEGIN CERTIFICATE-----/d' -e '/-----END CERTIFICATE-----/d')
-if [ -z "${CERTIFICATE_CONTENT_SECURELOCK}" ]; then
-  echo "ERROR! PUBLIC_KEY_SECURELOCK not found"
-  exit 1
-else
-  echo "FOUND PUBLIC_KEY_SECURELOCK"
-fi
-
-
-
-echo -e "${PUBLIC_KEY_SECURELOCK}" > certificate.securelock.crt
-echo "Listing certificate PUBLIC_KEY_SECURELOCK:"
-cat certificate.securelock.crt
-
-
-CERTIFICATE_CONTENT_TRUSTEDZONE="MIIBczCB+6ADAgECAgkAkZLVvEgT6QgwCgYIKoZIzj0EAwMwEjEQMA4GA1UEAwwHQ0FfQ0VSVDAgFw0yNDA2MDUwODEyMjhaGA80MDk2MDEwMTAwMDAwMFowFjEUMBIGA1UEAwwLU0VSVkVSX0NFUlQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARuZILgRDczZfYdvx+GP3MMNKWX0SsUYkG3ySN/lJL0iEm/rgjoLDRT2gV8p+xfzeGPqzAjL/6/5N7JLjKdmzMCSi0umbFKIzV1UOBQMoTye8Kq9pmrZSKW/gcDeg2tDb+jFzAVMBMGA1UdJQQMMAoGCCsGAQUFBwMBMAoGCCqGSM49BAMDA2cAMGQCMDjiF3lBtlj+AiPu7k4AiaPcluAk8V7AFrKpNwfLCsmR8iSkjKuhMSWN0+Y1htUg+wIwVSY9CI8vbUJYWvOCd7n5IjLq2G0SF8Kw9k5BmX6XucnZxHc9dFgLm+6pcpuQg3YG"
-export PUBLIC_KEY_TRUSTEDZONE="-----BEGIN CERTIFICATE-----\n${CERTIFICATE_CONTENT_TRUSTEDZONE}\n-----END CERTIFICATE-----"
-echo -e "${PUBLIC_KEY_TRUSTEDZONE}" > certificate.trustedzone.crt
-echo "Listing certificate PUBLIC_KEY_TRUSTEDZONE:"
-cat certificate.trustedzone.crt
-
-echo "**** Started ipfs final ****"
-if [ -f ipfs.sh ]; then
-    chmod +x ipfs.sh
-    ./ipfs.sh
-else
-    echo "Warning: ipfs.sh not found. Skipping IPFS setup."
-fi
-echo "**** Finished ipfs final ****"
-
-echo "Adding certificates for SECURELOCK into IMAGE REGISTRY smart contract..."
-if [ -f image_registry_runner.py ]; then
-    brew install python3
-    python3 -m venv venv
-    source venv/bin/activate
-    pip3 install --no-cache --upgrade pip minio web3==5.17.0 eth_account python-dotenv requests
-    python3 image_registry_runner.py
-    deactivate
-else
-    echo "Warning: image_registry_runner.py not found. Skipping certificate addition to IMAGE REGISTRY smart contract."
-fi
-
-echo "Script completed successfully."

package/nodenithy/scripts/build-ipfs-upload.sh

@@ -1,23 +0,0 @@
-#!/bin/sh
-
-apk add screen
-
-cd /
-wget https://github.com/ipfs/kubo/releases/download/v0.17.0/kubo_v0.17.0_linux-386.tar.gz
-tar zxvf kubo_v0.17.0_linux-386.tar.gz
-mv kubo go-ipfs
-cd go-ipfs
-./ipfs init
-
-screen -dm -t ipfs-swarm watch /go-ipfs/ipfs swarm connect /ip4/31.7.188.59/tcp/4001/p2p/QmRBc1eBt4hpJQUqHqn6eA8ixQPD3LFcUDsn6coKBQtia5
-
-screen -dm -t ipfs-daemon /ipfs-daemon.sh
-
-sleep 10
-
-cd /var/lib/registry
-HASH=`/go-ipfs/ipfs add . -r | grep added | tail -1 | awk '{print $2}'`
-/go-ipfs/ipfs pin add ${HASH}
-
-
-echo "HASH is ${HASH}"