@ethernity-cloud/sdk-js 1.7.0 → 1.7.1

package/README.md

@@ -43,7 +43,7 @@ The sdk has been tested on the following operating systems:
       provisioned by the ethernity-cas validator set exactly as on mainnet.
       `ecld-publish` registers the securelock session on-chain in the
       SessionRegistry (`0xcb1F389b...`, see `cas/config.js`), resolves a CAS
-      from the ValidatorRegistry (`0xa821b36F...`, or `ECLD_CAS_ADDR=host:port`)
+      from the ValidatorRegistry (`0x0014aB10...`, or `ECLD_CAS_ADDR=host:port`)
       for the compose and the certificate harvest, takes the trustedzone
       session name from the ImageRegistry (ECImageRegistryV2,
       `0x99A84C62...`), and links the session to the published image. `ecld-build` signs the securelock `--production`.
@@ -53,7 +53,7 @@ The sdk has been tested on the following operating systems:
 - LitVM:
     - LiteForge - CAS-attested the same way, by LitVM's own ethernity-cas
       validator set (SessionRegistry `0x8ad24b3F...`, ValidatorRegistry
-      `0x2E27677f...`).
+      `0xbE3759f3...`).
     - LiteForge Unsafe - the unsafe network beside LiteForge (see below).
 - Polyhon:
     - Amoy Testnet - to be provided during the following updates
@@ -189,63 +189,63 @@ function hello(msg='World') {
 
 module.exports = { hello };
 ```
-From your frontend application, using the ethernity cloud runner library, you will be calling the function as seen in the below example, where we pass `hello("World");` to be executed on the backend which will run in the Blockchain:
+From your frontend application, using the ethernity cloud runner library (`@ethernity-cloud/runner`, installed by `ecld-init` at the version this SDK depends on), you will be calling the function as seen in the below example, where we pass `hello("World");` to be executed on the backend which will run in the Blockchain. `npm start` runs `src/preStart.mjs` first, which fills the constants at the top from the project's `.env`: the securelock name the dApp is published as, the trustedzone it was built against, the network's token address and chain id, the `-unsafe` network when the dApp runs without a CAS, and the IPFS endpoint.
 ```js
-const AppCss = require('./App.css');
+import './App.css';
 import EthernityCloudRunner from "@ethernity-cloud/runner";
-import {ECEvent, ECRunner, ECStatus} from "@ethernity-cloud/runner/enums";
-import Web3 from 'web3';
+import { ECStatus } from "@ethernity-cloud/runner/enums";
 
+// Filled in from the project's .env by src/preStart.mjs on `npm start`.
 const PROJECT_NAME = "";
+const TRUSTED_ZONE_IMAGE = "";
+const NETWORK_ADDRESS = "";
+const CHAIN_ID = null;
+const UNSAFE_NETWORK = null;
 const IPFS_ENDPOINT = "";
 
+// A call into src/serverless/backend.js; its return value is the task result.
 const code = `hello("World");`;
 
 function App() {
     const executeTask = async () => {
-        const runner = new EthernityCloudRunner();
-        // this is a server provided by Ethernity CLOUD, please bear in mind that you can use your own Decentralized Storage server
-        const ipfsAddress = IPFS_ENDPOINT;
-        runner.initializeStorage(ipfsAddress);
-        console.log(PROJECT_NAME)
-        const onTaskProgress = (e) => {
-            if (e.detail.status === ECStatus.ERROR) {
-                console.error(e.detail.message);
-            } else {
-                console.log(e.detail.message);
-            }
-        };
-
-        const onTaskCompleted = (e) => {
-            console.log(`Task Result: ${e.detail.message.result}`);
-            // display the result in page below the buttons
-            const result = document.createElement("p");
-            result.innerHTML = `Task Result: ${e.detail.message.result}`;
-            document.body.appendChild(result);
+        // The browser wallet (MetaMask) signs and pays for the order.
+        const runner = new EthernityCloudRunner(NETWORK_ADDRESS, {}, CHAIN_ID || undefined);
+        if (UNSAFE_NETWORK) {
+            await runner.setNetwork(...UNSAFE_NETWORK);
         }
-
-        runner.addEventListener(ECEvent.TASK_PROGRESS, onTaskProgress);
-        runner.addEventListener(ECEvent.TASK_COMPLETED, onTaskCompleted);
-
-        await runner.run(PROJECT_NAME,
-                        code,
-                         '',
-                         { taskPrice: 10, cpu: 1, memory: 1, storage: 10, bandwidth: 1, duration: 1, validators: 1 });
+        runner.initializeStorage(IPFS_ENDPOINT);
+
+        // Events are named by task status; detail is { message, status, progress }.
+        runner.addEventListener(ECStatus.DEFAULT, (e) => {
+            console.log(`[${e.detail.progress}] ${e.detail.message}`);
+        });
+        runner.addEventListener(ECStatus.ERROR, (e) => {
+            console.error(e.detail.message);
+        });
+        runner.addEventListener(ECStatus.SUCCESS, async () => {
+            const result = await runner.getResult();
+            console.log(`Task Result: ${result}`);
+            const line = document.createElement("p");
+            line.textContent = `Task Result: ${result}`;
+            document.body.appendChild(line);
+        });
+
+        const resources = { taskPrice: 10, cpu: 1, memory: 1, storage: 10, bandwidth: 1, duration: 1, validators: 1 };
+        await runner.run(resources, PROJECT_NAME, code, '', TRUSTED_ZONE_IMAGE);
     };
+
     const connectWallet = async () => {
-      if (window.ethereum) {
-          window.web3 = new Web3(window.ethereum);
-          try {
-              // Request account access
-              await window.ethereum.request({ method: 'eth_requestAccounts' });
-              console.log("Wallet connected");
-          } catch (error) {
-              console.error("User denied account access");
-          }
-      } else {
-          console.log('Please install MetaMask!');
-      }
-  };
+        if (!window.ethereum) {
+            console.log('Please install MetaMask!');
+            return;
+        }
+        try {
+            await window.ethereum.request({ method: 'eth_requestAccounts' });
+            console.log("Wallet connected");
+        } catch (error) {
+            console.error("User denied account access");
+        }
+    };
 
     return (
         <div className="container">

package/cas/config.js

@@ -14,10 +14,10 @@
 // Kept in sync with etny-{pynithy,nodenithy}/v3/networks.yaml
 // (cas_session_registry_address, validator_registry_address).
 const VALIDATOR_REGISTRY = {
-  'etny-pynithy-testnet': '0xa821b36F378F76c793c436F5f9c9CC36c684eBE5',
-  'etny-nodenithy-testnet': '0xa821b36F378F76c793c436F5f9c9CC36c684eBE5',
-  'ecld-pynithy-litvm-testnet': '0x2E27677fb67531eb09134fE331C27899f87ADe10',
-  'ecld-nodenithy-litvm-testnet': '0x2E27677fb67531eb09134fE331C27899f87ADe10',
+  'etny-pynithy-testnet': '0x0014aB102FEa6b02e3D793FF4b9a0Af309fB4E14',
+  'etny-nodenithy-testnet': '0x0014aB102FEa6b02e3D793FF4b9a0Af309fB4E14',
+  'ecld-pynithy-litvm-testnet': '0xbE3759f327e8643fC5A1717fb2072A0dAcBAD29E',
+  'ecld-nodenithy-litvm-testnet': '0xbE3759f327e8643fC5A1717fb2072A0dAcBAD29E',
 };
 
 const SESSION_REGISTRY = {

package/init.js

@@ -310,9 +310,11 @@ const main = async () => {
       );
     }
     console.log("Installing required packages...");
-    // Simulate npm install
+    // The app runs on the runner at the range this SDK depends on; the spec is
+    // quoted because cmd.exe treats a bare ^ as its escape character.
+    const runnerSpec = `@ethernity-cloud/runner@${require("./package.json").dependencies["@ethernity-cloud/runner"]}`;
     execSync(
-      "npm install @ethernity-cloud/runner@0.0.26 @testing-library/jest-dom@5.17.0 @testing-library/react@13.4.0 @testing-library/user-event@13.5.0 react@18.3.1 react-dom@18.3.1 react-scripts@5.0.1 web-vitals@2.1.4 web3@4.9.0 dotenv@16.4.5",
+      `npm install "${runnerSpec}" @testing-library/jest-dom@5.17.0 @testing-library/react@13.4.0 @testing-library/user-event@13.5.0 react@18.3.1 react-dom@18.3.1 react-scripts@5.0.1 web-vitals@2.1.4 dotenv@16.4.5`,
       { stdio: "inherit" },
     );
   } else {

package/network.js

@@ -0,0 +1,51 @@
+/* The runner's view of a project's network.
+ *
+ * BLOCKCHAIN_NETWORK, as ecld-init writes it (spaces -> underscores), names a
+ * network; the runner is constructed with that network's token ADDRESS, the
+ * chain id of a testnet whose token address other testnets share, and for an
+ * -unsafe network is set to the (network, type) that runs only -unsafe
+ * trustedzones. The table is built from the runner's own enums so the two
+ * cannot drift; the enums are an argument because the runner is ESM and this
+ * module is loaded from CJS (ecld-run) and ESM (a dApp's preStart) alike.
+ * Shared by ecld-run and the Hello World template's src/preStart.mjs. */
+
+'use strict';
+
+const casConfig = require('./cas/config.js');
+
+/* Accepts a few spellings per network. Returns the normalised key, the
+ * network ({ address, chainId?, unsafe? }) or null, and the known keys. */
+function networkFor({ ECAddress, ECNetworkByChainId }, raw) {
+  const key = String(raw || '').trim().toUpperCase().replace(/\s+/g, '_');
+  const bloxbergTestnet = { address: ECAddress.BLOXBERG.TESTNET_ADDRESS };
+  const amoy = { address: ECAddress.POLYGON.TESTNET_ADDRESS };
+  const sepolia = { address: ECAddress.SEPOLIA.TESTNET_ADDRESS, chainId: ECNetworkByChainId.SEPOLIA.TESTNET };
+  const litvm = { address: ECAddress.LITVM.TESTNET_ADDRESS, chainId: ECNetworkByChainId.LITVM.TESTNET };
+  const table = {
+    BLOXBERG_TESTNET: bloxbergTestnet,
+    BLOXBERG_TESTNET_UNSAFE: { ...bloxbergTestnet, unsafe: ['BLOXBERG', 'TESTNET_UNSAFE'] },
+    BLOXBERG_MAINNET: { address: ECAddress.BLOXBERG.MAINNET_ADDRESS },
+    POLYGON_MAINNET: { address: ECAddress.POLYGON.MAINNET_ADDRESS },
+    POLYGON_AMOY: amoy,
+    POLYGON_AMOY_TESTNET: amoy,
+    IOTEX_TESTNET: { address: ECAddress.IOTEX.TESTNET_ADDRESS, chainId: ECNetworkByChainId.IOTEX.TESTNET },
+    ETHEREUM_SEPOLIA: sepolia,
+    SEPOLIA: sepolia,
+    LITVM_LITEFORGE: litvm,
+    LITVM: litvm,
+    LITVM_LITEFORGE_UNSAFE: { ...litvm, unsafe: ['LITVM', 'TESTNET_UNSAFE'] },
+  };
+  return { key, network: table[key] || null, known: Object.keys(table) };
+}
+
+/* The -unsafe network a network token names, or whose sibling it names; null
+ * when the network has no -unsafe variant. */
+function unsafeVariant(raw) {
+  const key = String(raw || '').trim().replace(/\s+/g, '_');
+  if (casConfig.isUnsafeNetwork(key)) return key;
+  const variant = Object.keys(casConfig.UNSAFE_NETWORKS)
+    .find((name) => casConfig.UNSAFE_NETWORKS[name].toUpperCase() === key.toUpperCase());
+  return variant || null;
+}
+
+module.exports = { networkFor, unsafeVariant };

package/nodenithy/src/ec_helloworld_example.js

@@ -1,58 +1,62 @@
-const AppCss = require('./App.css');
+import './App.css';
 import EthernityCloudRunner from "@ethernity-cloud/runner";
-import {ECEvent, ECRunner, ECStatus} from "@ethernity-cloud/runner/enums";
-import Web3 from 'web3';
+import { ECStatus } from "@ethernity-cloud/runner/enums";
 
+// Filled in from the project's .env by src/preStart.mjs on `npm start`: the
+// securelock this dApp is published as, the trustedzone it was built against,
+// the network's token address and chain id, the -unsafe network when the dApp
+// runs without a CAS (null otherwise), and the IPFS endpoint.
 const PROJECT_NAME = "";
+const TRUSTED_ZONE_IMAGE = "";
+const NETWORK_ADDRESS = "";
+const CHAIN_ID = null;
+const UNSAFE_NETWORK = null;
 const IPFS_ENDPOINT = "";
 
+// A call into src/serverless/backend.js; its return value is the task result.
 const code = `hello("World");`;
 
 function App() {
     const executeTask = async () => {
-        const runner = new EthernityCloudRunner();
-        // this is a server provided by Ethernity CLOUD, please bear in mind that you can use your own Decentralized Storage server
-        const ipfsAddress = IPFS_ENDPOINT;
-        runner.initializeStorage(ipfsAddress);
-        console.log(PROJECT_NAME)
-        const onTaskProgress = (e) => {
-            if (e.detail.status === ECStatus.ERROR) {
-                console.error(e.detail.message);
-            } else {
-                console.log(e.detail.message);
-            }
-        };
-
-        const onTaskCompleted = (e) => {
-            console.log(`Task Result: ${e.detail.message.result}`);
-            // display the result in page below the buttons
-            const result = document.createElement("p");
-            result.innerHTML = `Task Result: ${e.detail.message.result}`;
-            document.body.appendChild(result);
+        // The browser wallet (MetaMask) signs and pays for the order.
+        const runner = new EthernityCloudRunner(NETWORK_ADDRESS, {}, CHAIN_ID || undefined);
+        if (UNSAFE_NETWORK) {
+            await runner.setNetwork(...UNSAFE_NETWORK);
         }
+        runner.initializeStorage(IPFS_ENDPOINT);
 
-        runner.addEventListener(ECEvent.TASK_PROGRESS, onTaskProgress);
-        runner.addEventListener(ECEvent.TASK_COMPLETED, onTaskCompleted);
+        // Events are named by task status; detail is { message, status, progress }.
+        runner.addEventListener(ECStatus.DEFAULT, (e) => {
+            console.log(`[${e.detail.progress}] ${e.detail.message}`);
+        });
+        runner.addEventListener(ECStatus.ERROR, (e) => {
+            console.error(e.detail.message);
+        });
+        runner.addEventListener(ECStatus.SUCCESS, async () => {
+            const result = await runner.getResult();
+            console.log(`Task Result: ${result}`);
+            // display the result in page below the buttons
+            const line = document.createElement("p");
+            line.textContent = `Task Result: ${result}`;
+            document.body.appendChild(line);
+        });
 
-        await runner.run(PROJECT_NAME,
-                        code,
-                         '',
-                         { taskPrice: 10, cpu: 1, memory: 1, storage: 10, bandwidth: 1, duration: 1, validators: 1 });
+        const resources = { taskPrice: 10, cpu: 1, memory: 1, storage: 10, bandwidth: 1, duration: 1, validators: 1 };
+        await runner.run(resources, PROJECT_NAME, code, '', TRUSTED_ZONE_IMAGE);
     };
+
     const connectWallet = async () => {
-      if (window.ethereum) {
-          window.web3 = new Web3(window.ethereum);
-          try {
-              // Request account access
-              await window.ethereum.request({ method: 'eth_requestAccounts' });
-              console.log("Wallet connected");
-          } catch (error) {
-              console.error("User denied account access");
-          }
-      } else {
-          console.log('Please install MetaMask!');
-      }
-  };
+        if (!window.ethereum) {
+            console.log('Please install MetaMask!');
+            return;
+        }
+        try {
+            await window.ethereum.request({ method: 'eth_requestAccounts' });
+            console.log("Wallet connected");
+        } catch (error) {
+            console.error("User denied account access");
+        }
+    };
 
     return (
         <div className="container">
@@ -61,4 +65,4 @@ function App() {
         </div>
     );
 }
-export default App;
+export default App;

package/nodenithy/src/preStart.mjs

@@ -1,57 +1,47 @@
+// Runs before `react-scripts start` (the project's `npm start`): fills the
+// constants at the top of src/ec_helloworld_example.js from the project's
+// .env, the way ecld-run reads the same values. PROJECT_NAME and
+// TRUSTED_ZONE_IMAGE take their -unsafe form on an -unsafe network; the
+// network's token address, chain id and -unsafe (network, type) come from the
+// runner's own enums through the SDK's network table.
 import fs from 'fs';
+import { createRequire } from 'module';
 import dotenv from 'dotenv';
-dotenv.config();
+import * as enums from '@ethernity-cloud/runner/enums.js';
 
-export const ECRunner = {
-  'etny-pynithy-testnet': ['0x02882F03097fE8cD31afbdFbB5D72a498B41112c'],
-  'etny-nodenithy-testnet': ['0x02882F03097fE8cD31afbdFbB5D72a498B41112c'],
-  'etny-pynithy': ['0x549A6E06BB2084100148D50F51CF77a3436C3Ae7'],
-  'etny-nodenithy': ['0x549A6E06BB2084100148D50F51CF77a3436C3Ae7'],
-  'ecld-nodenithy-testnet': ['0xfb450e40f590F1B5A119a4B82E6F3579D6742a00'],
-  'ecld-pynithy': ['0xc6920888988cAcEeA7ACCA0c96f2D65b05eE22Ba'],
-  'ecld-nodenithy': ['0xc6920888988cAcEeA7ACCA0c96f2D65b05eE22Ba']
+dotenv.config();
+const require = createRequire(import.meta.url);
+const casConfig = require('@ethernity-cloud/sdk-js/cas/config.js');
+const { networkFor } = require('@ethernity-cloud/sdk-js/network.js');
+
+const { PROJECT_NAME, TRUSTED_ZONE_IMAGE, BLOCKCHAIN_NETWORK, IPFS_ENDPOINT } = process.env;
+if (!PROJECT_NAME || !BLOCKCHAIN_NETWORK) {
+  console.error('preStart: PROJECT_NAME and BLOCKCHAIN_NETWORK are not set in .env; run `npm run ecld-init` first.');
+  process.exit(1);
+}
+const { network, known } = networkFor(enums, BLOCKCHAIN_NETWORK);
+if (!network) {
+  console.error(`preStart: unknown BLOCKCHAIN_NETWORK '${BLOCKCHAIN_NETWORK}' in .env. Known: ${known.join(', ')}`);
+  process.exit(1);
+}
+
+const constants = {
+  PROJECT_NAME: casConfig.nameOnNetwork(PROJECT_NAME, BLOCKCHAIN_NETWORK),
+  TRUSTED_ZONE_IMAGE: casConfig.nameOnNetwork(TRUSTED_ZONE_IMAGE, BLOCKCHAIN_NETWORK) || '',
+  NETWORK_ADDRESS: network.address,
+  CHAIN_ID: network.chainId || null,
+  UNSAFE_NETWORK: network.unsafe || null,
+  IPFS_ENDPOINT: IPFS_ENDPOINT || 'https://ipfs.ethernity.cloud',
 };
 
 const filePath = 'src/ec_helloworld_example.js';
-const fileContent = fs.readFileSync(filePath, 'utf8');
-
-const updatedContent = fileContent
-    .replace(/const PROJECT_NAME = ".*?";/, `const PROJECT_NAME = "${process.env.PROJECT_NAME}";`)
-    .replace(/const IPFS_ENDPOINT = ".*?";/, `const IPFS_ENDPOINT = "${process.env.IPFS_ENDPOINT}";`)
-    .replace(/new EthernityCloudRunner\(.*?\);/, `new EthernityCloudRunner('${ECRunner[process.env.ENCLAVE_NAME_TRUSTEDZONE]}');`);
-
-fs.writeFileSync(filePath, updatedContent, 'utf8');
-
-// const code = updatedContent.match(/const code = `hello\("(.*?)"\);/)[1];
-
-const imageRegistryPath = 'node_modules/@ethernity-cloud/runner/contract/operation/imageRegistryContract.js';
-const imageRegistryContent = fs.readFileSync(imageRegistryPath, 'utf8');
-
-// Log the original content for debugging
-// console.log('Original imageRegistryContent:', imageRegistryContent);
-
-// Replace the content in imageRegistryContract.js
-// const updatedImageRegistryContent = imageRegistryContent.replace(/getLatestTrustedZoneImageCertPublicKey\([^)]*\);/, "getLatestTrustedZoneImageCertPublicKey('" + process.env.ENCLAVE_NAME_TRUSTEDZONE + "', 'v3')").replace(/getLatestImageVersionPublicKey\([^)]*\)/, "getLatestImageVersionPublicKey(imageName, '" + process.env.VERSION + "')");
-const updatedImageRegistryContent = imageRegistryContent.replace(
-    /async getEnclaveDetailsV3\(.*?\{[\s\S]*?\}\s*\}/,
-    `async getEnclaveDetailsV3(imageName, version) {
-      try {
-        const trustedZonePublicKey = (await this.contract.getLatestTrustedZoneImageCertPublicKey('${process.env.ENCLAVE_NAME_TRUSTEDZONE}', 'v3'));
-        const imageDetails = await this.contract.getLatestImageVersionPublicKey(imageName, '${process.env.VERSION}');
-        return [imageDetails[0], trustedZonePublicKey[1], imageDetails[2]];
-      } catch (e) {
-        console.log(e);
-        return null;
-      }
-    }`
-  );
-
-
-fs.writeFileSync(imageRegistryPath, updatedImageRegistryContent, 'utf8');
-
-const runnerPath = 'node_modules/@ethernity-cloud/runner/runner.js';
-const runnerContent = fs.readFileSync(runnerPath, 'utf8');
-
-const updatedRunnerContent = runnerContent.replace(/this.#enclaveImageIPFSHash}:.*?:/, "this.#enclaveImageIPFSHash}:"+process.env.ENCLAVE_NAME_TRUSTEDZONE+":").replace(/new ImageRegistryContract\([^)]*\);/, "new ImageRegistryContract(this.#networkAddress, '"+process.env.ENCLAVE_NAME_TRUSTEDZONE+"');");
-
-fs.writeFileSync(runnerPath, updatedRunnerContent, 'utf8');
+let content = fs.readFileSync(filePath, 'utf8');
+for (const [name, value] of Object.entries(constants)) {
+  const line = new RegExp(`^const ${name} = .*;$`, 'm');
+  if (!line.test(content)) {
+    console.error(`preStart: ${filePath} has no 'const ${name} = ...;' line to fill.`);
+    process.exit(1);
+  }
+  content = content.replace(line, `const ${name} = ${JSON.stringify(value)};`);
+}
+fs.writeFileSync(filePath, content, 'utf8');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ethernity-cloud/sdk-js",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "A package to run ethernity cloud build scripts",
   "scripts": {
     "ecld-build": "cross-env node ./node_modules/@ethernity-cloud/sdk-js/build.js",
@@ -31,11 +31,12 @@
     "test.js",
     "info.js",
     "run.js",
+    "network.js",
     "!**/__pycache__/**",
     "!**/*.pyc"
   ],
   "dependencies": {
-    "@ethernity-cloud/runner": "^0.6.0",
+    "@ethernity-cloud/runner": "^0.6.1",
     "acorn": "^8.11.0",
     "adm-zip": "^0.5.14",
     "axios": "^1.7.2",

package/pynithy/src/ec_helloworld_example.js

@@ -1,58 +1,62 @@
-const AppCss = require('./App.css');
+import './App.css';
 import EthernityCloudRunner from "@ethernity-cloud/runner";
-import {ECEvent, ECRunner, ECStatus} from "@ethernity-cloud/runner/enums";
-import Web3 from 'web3';
+import { ECStatus } from "@ethernity-cloud/runner/enums";
 
+// Filled in from the project's .env by src/preStart.mjs on `npm start`: the
+// securelock this dApp is published as, the trustedzone it was built against,
+// the network's token address and chain id, the -unsafe network when the dApp
+// runs without a CAS (null otherwise), and the IPFS endpoint.
 const PROJECT_NAME = "";
+const TRUSTED_ZONE_IMAGE = "";
+const NETWORK_ADDRESS = "";
+const CHAIN_ID = null;
+const UNSAFE_NETWORK = null;
 const IPFS_ENDPOINT = "";
 
+// A call into src/serverless/backend.py; its return value is the task result.
 const code = `hello("World")`;
 
 function App() {
     const executeTask = async () => {
-        const runner = new EthernityCloudRunner();
-        // this is a server provided by Ethernity CLOUD, please bear in mind that you can use your own Decentralized Storage server
-        const ipfsAddress = IPFS_ENDPOINT;
-        runner.initializeStorage(ipfsAddress);
-        console.log(PROJECT_NAME)
-        const onTaskProgress = (e) => {
-            if (e.detail.status === ECStatus.ERROR) {
-                console.error(e.detail.message);
-            } else {
-                console.log(e.detail.message);
-            }
-        };
-
-        const onTaskCompleted = (e) => {
-            console.log(`Task Result: ${e.detail.message.result}`);
-            // display the result in page below the buttons
-            const result = document.createElement("p");
-            result.innerHTML = `Task Result: ${e.detail.message.result}`;
-            document.body.appendChild(result);
+        // The browser wallet (MetaMask) signs and pays for the order.
+        const runner = new EthernityCloudRunner(NETWORK_ADDRESS, {}, CHAIN_ID || undefined);
+        if (UNSAFE_NETWORK) {
+            await runner.setNetwork(...UNSAFE_NETWORK);
         }
+        runner.initializeStorage(IPFS_ENDPOINT);
 
-        runner.addEventListener(ECEvent.TASK_PROGRESS, onTaskProgress);
-        runner.addEventListener(ECEvent.TASK_COMPLETED, onTaskCompleted);
+        // Events are named by task status; detail is { message, status, progress }.
+        runner.addEventListener(ECStatus.DEFAULT, (e) => {
+            console.log(`[${e.detail.progress}] ${e.detail.message}`);
+        });
+        runner.addEventListener(ECStatus.ERROR, (e) => {
+            console.error(e.detail.message);
+        });
+        runner.addEventListener(ECStatus.SUCCESS, async () => {
+            const result = await runner.getResult();
+            console.log(`Task Result: ${result}`);
+            // display the result in page below the buttons
+            const line = document.createElement("p");
+            line.textContent = `Task Result: ${result}`;
+            document.body.appendChild(line);
+        });
 
-        await runner.run(PROJECT_NAME,
-                        code,
-                         '0xd58f5C1834279ABD601df85b3E4b2323aDD4E75e',
-                         { taskPrice: 6, cpu: 1, memory: 1, storage: 10, bandwidth: 1, duration: 1, validators: 1 });
+        const resources = { taskPrice: 10, cpu: 1, memory: 1, storage: 10, bandwidth: 1, duration: 1, validators: 1 };
+        await runner.run(resources, PROJECT_NAME, code, '', TRUSTED_ZONE_IMAGE);
     };
+
     const connectWallet = async () => {
-      if (window.ethereum) {
-          window.web3 = new Web3(window.ethereum);
-          try {
-              // Request account access
-              await window.ethereum.request({ method: 'eth_requestAccounts' });
-              console.log("Wallet connected");
-          } catch (error) {
-              console.error("User denied account access");
-          }
-      } else {
-          console.log('Please install MetaMask!');
-      }
-  };
+        if (!window.ethereum) {
+            console.log('Please install MetaMask!');
+            return;
+        }
+        try {
+            await window.ethereum.request({ method: 'eth_requestAccounts' });
+            console.log("Wallet connected");
+        } catch (error) {
+            console.error("User denied account access");
+        }
+    };
 
     return (
         <div className="container">
@@ -61,4 +65,4 @@ function App() {
         </div>
     );
 }
-export default App;
+export default App;

package/pynithy/src/preStart.mjs

@@ -1,57 +1,47 @@
+// Runs before `react-scripts start` (the project's `npm start`): fills the
+// constants at the top of src/ec_helloworld_example.js from the project's
+// .env, the way ecld-run reads the same values. PROJECT_NAME and
+// TRUSTED_ZONE_IMAGE take their -unsafe form on an -unsafe network; the
+// network's token address, chain id and -unsafe (network, type) come from the
+// runner's own enums through the SDK's network table.
 import fs from 'fs';
+import { createRequire } from 'module';
 import dotenv from 'dotenv';
-dotenv.config();
+import * as enums from '@ethernity-cloud/runner/enums.js';
 
-export const ECRunner = {
-  'etny-pynithy-testnet': ['0x02882F03097fE8cD31afbdFbB5D72a498B41112c'],
-  'etny-nodenithy-testnet': ['0x02882F03097fE8cD31afbdFbB5D72a498B41112c'],
-  'etny-pynithy': ['0x549A6E06BB2084100148D50F51CF77a3436C3Ae7'],
-  'etny-nodenithy': ['0x549A6E06BB2084100148D50F51CF77a3436C3Ae7'],
-  'ecld-nodenithy-testnet': ['0xfb450e40f590F1B5A119a4B82E6F3579D6742a00'],
-  'ecld-pynithy': ['0xc6920888988cAcEeA7ACCA0c96f2D65b05eE22Ba'],
-  'ecld-nodenithy': ['0xc6920888988cAcEeA7ACCA0c96f2D65b05eE22Ba']
+dotenv.config();
+const require = createRequire(import.meta.url);
+const casConfig = require('@ethernity-cloud/sdk-js/cas/config.js');
+const { networkFor } = require('@ethernity-cloud/sdk-js/network.js');
+
+const { PROJECT_NAME, TRUSTED_ZONE_IMAGE, BLOCKCHAIN_NETWORK, IPFS_ENDPOINT } = process.env;
+if (!PROJECT_NAME || !BLOCKCHAIN_NETWORK) {
+  console.error('preStart: PROJECT_NAME and BLOCKCHAIN_NETWORK are not set in .env; run `npm run ecld-init` first.');
+  process.exit(1);
+}
+const { network, known } = networkFor(enums, BLOCKCHAIN_NETWORK);
+if (!network) {
+  console.error(`preStart: unknown BLOCKCHAIN_NETWORK '${BLOCKCHAIN_NETWORK}' in .env. Known: ${known.join(', ')}`);
+  process.exit(1);
+}
+
+const constants = {
+  PROJECT_NAME: casConfig.nameOnNetwork(PROJECT_NAME, BLOCKCHAIN_NETWORK),
+  TRUSTED_ZONE_IMAGE: casConfig.nameOnNetwork(TRUSTED_ZONE_IMAGE, BLOCKCHAIN_NETWORK) || '',
+  NETWORK_ADDRESS: network.address,
+  CHAIN_ID: network.chainId || null,
+  UNSAFE_NETWORK: network.unsafe || null,
+  IPFS_ENDPOINT: IPFS_ENDPOINT || 'https://ipfs.ethernity.cloud',
 };
 
 const filePath = 'src/ec_helloworld_example.js';
-const fileContent = fs.readFileSync(filePath, 'utf8');
-
-const updatedContent = fileContent
-    .replace(/const PROJECT_NAME = ".*?";/, `const PROJECT_NAME = "${process.env.PROJECT_NAME}";`)
-    .replace(/const IPFS_ENDPOINT = ".*?";/, `const IPFS_ENDPOINT = "${process.env.IPFS_ENDPOINT}";`)
-    .replace(/new EthernityCloudRunner\(.*?\);/, `new EthernityCloudRunner('${ECRunner[process.env.ENCLAVE_NAME_TRUSTEDZONE]}');`);
-
-fs.writeFileSync(filePath, updatedContent, 'utf8');
-
-// const code = updatedContent.match(/const code = `hello\("(.*?)"\);/)[1];
-
-const imageRegistryPath = 'node_modules/@ethernity-cloud/runner/contract/operation/imageRegistryContract.js';
-const imageRegistryContent = fs.readFileSync(imageRegistryPath, 'utf8');
-
-// Log the original content for debugging
-// console.log('Original imageRegistryContent:', imageRegistryContent);
-
-// Replace the content in imageRegistryContract.js
-// const updatedImageRegistryContent = imageRegistryContent.replace(/getLatestTrustedZoneImageCertPublicKey\([^)]*\);/, "getLatestTrustedZoneImageCertPublicKey('" + process.env.ENCLAVE_NAME_TRUSTEDZONE + "', 'v3')").replace(/getLatestImageVersionPublicKey\([^)]*\)/, "getLatestImageVersionPublicKey(imageName, '" + process.env.VERSION + "')");
-const updatedImageRegistryContent = imageRegistryContent.replace(
-    /async getEnclaveDetailsV3\(.*?\{[\s\S]*?\}\s*\}/,
-    `async getEnclaveDetailsV3(imageName, version) {
-      try {
-        const trustedZonePublicKey = (await this.contract.getLatestTrustedZoneImageCertPublicKey('${process.env.ENCLAVE_NAME_TRUSTEDZONE}', 'v3'));
-        const imageDetails = await this.contract.getLatestImageVersionPublicKey(imageName, '${process.env.VERSION}');
-        return [imageDetails[0], trustedZonePublicKey[1], imageDetails[2]];
-      } catch (e) {
-        console.log(e);
-        return null;
-      }
-    }`
-  );
-
-
-fs.writeFileSync(imageRegistryPath, updatedImageRegistryContent, 'utf8');
-
-const runnerPath = 'node_modules/@ethernity-cloud/runner/runner.js';
-const runnerContent = fs.readFileSync(runnerPath, 'utf8');
-
-const updatedRunnerContent = runnerContent.replace(/this.#enclaveImageIPFSHash}:.*?:/, "this.#enclaveImageIPFSHash}:"+process.env.ENCLAVE_NAME_TRUSTEDZONE+":").replace(/new ImageRegistryContract\([^)]*\);/, "new ImageRegistryContract(this.#networkAddress, '"+process.env.ENCLAVE_NAME_TRUSTEDZONE+"');");
-
-fs.writeFileSync(runnerPath, updatedRunnerContent, 'utf8');
+let content = fs.readFileSync(filePath, 'utf8');
+for (const [name, value] of Object.entries(constants)) {
+  const line = new RegExp(`^const ${name} = .*;$`, 'm');
+  if (!line.test(content)) {
+    console.error(`preStart: ${filePath} has no 'const ${name} = ...;' line to fill.`);
+    process.exit(1);
+  }
+  content = content.replace(line, `const ${name} = ${JSON.stringify(value)};`);
+}
+fs.writeFileSync(filePath, content, 'utf8');

package/run.js

@@ -40,48 +40,10 @@
 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 DEFAULT_IPFS = 'https://ipfs.ethernity.cloud/api/v0';
 
-/* Map a BLOCKCHAIN_NETWORK token (as ecld-init writes it, spaces -> underscores)
- * to the runner's network: its token ADDRESS, the chain id of a testnet whose
- * token address other testnets share, and for an -unsafe network the
- * (network, type) the runner is set to, which runs only -unsafe trustedzones.
- * Built from the runner's own enums so it can't drift. Accepts a few spellings
- * per network. */
-function networkFor({ ECAddress, ECNetworkByChainId }, raw) {
-  const key = String(raw || '').trim().toUpperCase().replace(/\s+/g, '_');
-  const bloxbergTestnet = { address: ECAddress.BLOXBERG.TESTNET_ADDRESS };
-  const amoy = { address: ECAddress.POLYGON.TESTNET_ADDRESS };
-  const sepolia = { address: ECAddress.SEPOLIA.TESTNET_ADDRESS, chainId: ECNetworkByChainId.SEPOLIA.TESTNET };
-  const litvm = { address: ECAddress.LITVM.TESTNET_ADDRESS, chainId: ECNetworkByChainId.LITVM.TESTNET };
-  const table = {
-    BLOXBERG_TESTNET: bloxbergTestnet,
-    BLOXBERG_TESTNET_UNSAFE: { ...bloxbergTestnet, unsafe: ['BLOXBERG', 'TESTNET_UNSAFE'] },
-    BLOXBERG_MAINNET: { address: ECAddress.BLOXBERG.MAINNET_ADDRESS },
-    POLYGON_MAINNET: { address: ECAddress.POLYGON.MAINNET_ADDRESS },
-    POLYGON_AMOY: amoy,
-    POLYGON_AMOY_TESTNET: amoy,
-    IOTEX_TESTNET: { address: ECAddress.IOTEX.TESTNET_ADDRESS, chainId: ECNetworkByChainId.IOTEX.TESTNET },
-    ETHEREUM_SEPOLIA: sepolia,
-    SEPOLIA: sepolia,
-    LITVM_LITEFORGE: litvm,
-    LITVM: litvm,
-    LITVM_LITEFORGE_UNSAFE: { ...litvm, unsafe: ['LITVM', 'TESTNET_UNSAFE'] },
-  };
-  return { key, network: table[key] || null, known: Object.keys(table) };
-}
-
-/* The -unsafe network a network token names, or whose sibling it names; null
- * when the network has no -unsafe variant. */
-function unsafeVariant(raw) {
-  const key = String(raw || '').trim().replace(/\s+/g, '_');
-  if (casConfig.isUnsafeNetwork(key)) return key;
-  const variant = Object.keys(casConfig.UNSAFE_NETWORKS)
-    .find((name) => casConfig.UNSAFE_NETWORKS[name].toUpperCase() === key.toUpperCase());
-  return variant || null;
-}
-
 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: '' };
   const positional = [];

package/nodenithy/src/preStart.js

@@ -1,45 +0,0 @@
-const fs = require('fs');
-require('dotenv').config();
-
-const filePath = 'src/ec_helloworld_example.js';
-const fileContent = fs.readFileSync(filePath, 'utf8');
-
-const updatedContent = fileContent
-    .replace(/const PROJECT_NAME = ".*?";/, `const PROJECT_NAME = "${process.env.PROJECT_NAME}";`)
-    .replace(/const IPFS_ENDPOINT = ".*?";/, `const IPFS_ENDPOINT = "${process.env.IPFS_ENDPOINT}";`)
-
-fs.writeFileSync(filePath, updatedContent, 'utf8');
-
-// const code = updatedContent.match(/const code = `hello\("(.*?)"\);/)[1];
-
-const imageRegistryPath = 'node_modules/@ethernity-cloud/runner/contract/operation/imageRegistryContract.js';
-const imageRegistryContent = fs.readFileSync(imageRegistryPath, 'utf8');
-
-// Log the original content for debugging
-// console.log('Original imageRegistryContent:', imageRegistryContent);
-
-// Replace the content in imageRegistryContract.js
-// const updatedImageRegistryContent = imageRegistryContent.replace(/getLatestTrustedZoneImageCertPublicKey\([^)]*\);/, "getLatestTrustedZoneImageCertPublicKey('" + process.env.ENCLAVE_NAME_TRUSTEDZONE + "', 'v3')").replace(/getLatestImageVersionPublicKey\([^)]*\)/, "getLatestImageVersionPublicKey(imageName, '" + process.env.VERSION + "')");
-const updatedImageRegistryContent = imageRegistryContent.replace(
-    /async getEnclaveDetailsV3\(.*?\{[\s\S]*?\}\s*\}/,
-    `async getEnclaveDetailsV3(imageName, version) {
-      try {
-        const trustedZonePublicKey = (await this.contract.getLatestTrustedZoneImageCertPublicKey('${process.env.ENCLAVE_NAME_TRUSTEDZONE}', 'v3'));
-        const imageDetails = await this.contract.getLatestImageVersionPublicKey(imageName, '${process.env.VERSION}');
-        return [imageDetails[0], trustedZonePublicKey[1], imageDetails[2]];
-      } catch (e) {
-        console.log(e);
-        return null;
-      }
-    }`
-  );
-
-
-fs.writeFileSync(imageRegistryPath, updatedImageRegistryContent, 'utf8');
-
-const runnerPath = 'node_modules/@ethernity-cloud/runner/runner.js';
-const runnerContent = fs.readFileSync(runnerPath, 'utf8');
-
-const updatedRunnerContent = runnerContent.replace(/this.#enclaveImageIPFSHash}:.*?:/, "this.#enclaveImageIPFSHash}:"+process.env.ENCLAVE_NAME_TRUSTEDZONE+":").replace(/new ImageRegistryContract\([^)]*\);/, "new ImageRegistryContract(this.#networkAddress, '"+process.env.ENCLAVE_NAME_TRUSTEDZONE+"');");
-
-fs.writeFileSync(runnerPath, updatedRunnerContent, 'utf8');