@ethernity-cloud/sdk-js 1.7.1 → 1.7.7

package/pynithy/ipfs.mjs

@@ -223,12 +223,13 @@ const retryOnFailure = async (fn, label) => {
   return null;
 };
 
-// Upload a single file: POST it to /api/v0/add and return its hash.
-const uploadFileToIPFSOnce = async (filePath) => {
+// Upload a single file: POST it to /api/v0/add and return its hash. With
+// onlyHash the node computes the same hash and stores nothing.
+const uploadFileToIPFSOnce = async (filePath, onlyHash = false) => {
   const files = [filePath];
   const dir = path.dirname(filePath);
   const { body, boundary, length } = buildMultipartBody(files, dir);
-  const { statusCode, text } = await postAdd('', body, boundary, length, null);
+  const { statusCode, text } = await postAdd(onlyHash ? '?only-hash=true' : '', body, boundary, length, null);
   if (statusCode !== 200) {
     console.log(`Failed to upload to IPFS. Status code: ${statusCode}`);
     return null;
@@ -260,13 +261,15 @@ const uploadFileToIPFS = async (filePath) => {
 };
 
 // Upload a whole directory with wrap-with-directory=true and return the root
-// directory hash -- the exact behaviour of Python's upload_dir.
-const uploadDirOnce = async (dirPath) => {
+// directory hash -- the exact behaviour of Python's upload_dir. With onlyHash
+// the node computes the same root hash and stores nothing.
+const uploadDirOnce = async (dirPath, onlyHash = false) => {
   const abs = path.resolve(dirPath);
   const files = gatherFiles(abs);
   const totalSize = files.reduce((acc, f) => acc + fs.statSync(f).size, 0);
   const totalMb = Math.floor(totalSize / (1024 * 1024));
   const { body, boundary, length } = buildMultipartBody(files, abs);
+  const step = onlyHash ? 'Hashing enclave for IPFS' : 'Uploading and pinning enclave to IPFS';
 
   let lastShownMb = -1;
   let frame = 0;
@@ -276,27 +279,28 @@ const uploadDirOnce = async (dirPath) => {
       frame = (frame + 1) % SPINNER_FRAMES.length;
       lastShownMb = mb;
       process.stdout.write(
-        `\r\t${SPINNER_FRAMES[frame]}  Uploading and pinning enclave to IPFS... ${mb}MB/${totalMb}MB`
+        `\r\t${SPINNER_FRAMES[frame]}  ${step}... ${mb}MB/${totalMb}MB`
       );
     }
   };
 
   const query =
-    '?quieter=true&stream-channels=true&wrap-with-directory=true&progress=false&timeout=5m';
+    '?quieter=true&stream-channels=true&wrap-with-directory=true&progress=false&timeout=5m' +
+    (onlyHash ? '&only-hash=true' : '');
   const { statusCode, text } = await postAdd(query, body, boundary, length, onProgress);
 
   if (statusCode !== 200) {
-    process.stdout.write(`\r\t${FAIL}Uploading and pinning enclave to IPFS\n`);
+    process.stdout.write(`\r\t${FAIL}${step}\n`);
     console.log(`Failed to upload to IPFS. Status code: ${statusCode}`);
     return false;
   }
   const rootHash = parseRootHash(text);
   if (!rootHash) {
-    process.stdout.write(`\r\t${FAIL}Uploading and pinning enclave to IPFS\n`);
+    process.stdout.write(`\r\t${FAIL}${step}\n`);
     console.log('Failed to upload to IPFS. Could not determine root hash.');
     return false;
   }
-  process.stdout.write(`\r\t${CHECK}Uploading and pinning enclave to IPFS\n`);
+  process.stdout.write(`\r\t${CHECK}${step}\n`);
   return rootHash;
 };
 
@@ -322,6 +326,16 @@ const upload = async (p) => {
   return null;
 };
 
+// The hash `upload(p)` gives, from the same add call with only-hash: the IPFS
+// node neither stores nor announces anything.
+const hashForIPFS = async (p) => {
+  const stat = fs.statSync(p);
+  if (stat.isFile()) return retryOnFailure(() => uploadFileToIPFSOnce(p, true), 'hash_file');
+  if (stat.isDirectory()) return retryOnFailure(() => uploadDirOnce(p, true), 'hash_dir');
+  console.log(`Path ${p} is neither a file nor a directory.`);
+  return null;
+};
+
 // ---------------------------------------------------------------------------
 // Download helpers (kubo-rpc-client based; unchanged behaviour)
 // ---------------------------------------------------------------------------
@@ -397,6 +411,7 @@ const getContentFromIPFS = async (hash, maxRetries = process.env.REACT_APP_IPFS_
 export {
   initialize,
   upload,
+  hashForIPFS,
   uploadFileToIPFS,
   uploadFolderToIPFS,
   getFromIPFS,
@@ -405,7 +420,7 @@ export {
 };
 
 // ---------------------------------------------------------------------------
-// CLI (unchanged interface: --host --action upload/download --filePath/--folderPath)
+// CLI: --host --action upload/hash/download --filePath/--folderPath
 // ---------------------------------------------------------------------------
 
 program
@@ -413,7 +428,7 @@ program
   .option('--hhash <hhash>', 'IPFS hash')
   .option('--filePath <path>', 'Path to the file')
   .option('--folderPath <path>', 'Path to the folder')
-  .option('--action <action>', 'Action to perform (upload, download)')
+  .option('--action <action>', 'Action to perform (upload, hash, download)')
   .option('--token <token>', 'IPFS authorization token')
   .option('--output <path>', 'Output path for download');
 
@@ -445,6 +460,15 @@ if (isMain) {
         console.error('Please provide a filePath or folderPath for upload.');
         process.exit(1);
       }
+    } else if (options.action === 'hash') {
+      const target = options.filePath || options.folderPath;
+      if (!target) {
+        console.error('Please provide a filePath or folderPath to hash.');
+        process.exit(1);
+      }
+      const hhash = await hashForIPFS(target);
+      console.log(`${hhash}`);
+      process.exit(hhash ? 0 : 1);
     } else if (options.action === 'download') {
       if (options.filePath) {
         await getFromIPFS(options.hhash, options.filePath);
@@ -456,7 +480,7 @@ if (isMain) {
         console.error('Please provide a filePath or folderPath for download.');
       }
     } else {
-      console.error('Please provide a valid action (upload, download).');
+      console.error('Please provide a valid action (upload, hash, download).');
       process.exit(1);
     }
   };

package/pynithy/run/image_registry.abi

@@ -1 +1 @@
-[{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"wallet","type":"address"}],"name":"AllowedWalletAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"wallet","type":"address"}],"name":"AllowedWalletRemoved","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"string","name":"ipfsHash","type":"string"},{"indexed":false,"internalType":"string","name":"publicKey","type":"string"},{"indexed":false,"internalType":"string","name":"version","type":"string"}],"name":"ImageAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"string","name":"ipfsHash","type":"string"}],"name":"ImagePublished","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"string","name":"ipfsHash","type":"string"}],"name":"ImageRemoved","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"string","name":"ipfsHash","type":"string"}],"name":"ImageValidated","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"previousOwner","type":"address"},{"indexed":true,"internalType":"address","name":"newOwner","type":"address"}],"name":"OwnerChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"string","name":"ipfsHash","type":"string"}],"name":"TrustedZoneImageAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"string","name":"ipfsHash","type":"string"}],"name":"TrustedZoneImageRemoved","type":"event"},{"inputs":[{"internalType":"address","name":"wallet","type":"address"}],"name":"addAllowedWallet","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"string","name":"ipfsHash","type":"string"},{"internalType":"string","name":"certPublicKey","type":"string"},{"internalType":"string","name":"version","type":"string"},{"internalType":"string","name":"imageName","type":"string"},{"internalType":"string","name":"dockerComposeHash","type":"string"},{"internalType":"string","name":"session","type":"string"},{"internalType":"uint8","name":"fee","type":"uint8"}],"name":"addImage","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"string","name":"ipfsHash","type":"string"},{"internalType":"string","name":"certPublicKey","type":"string"},{"internalType":"string","name":"version","type":"string"},{"internalType":"string","name":"imageName","type":"string"},{"internalType":"string","name":"dockerComposeHash","type":"string"},{"internalType":"string","name":"session","type":"string"},{"internalType":"uint8","name":"fee","type":"uint8"}],"name":"addTrustedZoneImage","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"string","name":"ipfsHash","type":"string"},{"internalType":"address","name":"newRewardAddress","type":"address"}],"name":"changeImageRewardAddress","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"newOwner","type":"address"}],"name":"changeOwner","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"string","name":"ipfsHash","type":"string"},{"internalType":"address","name":"newRewardAddress","type":"address"}],"name":"changeTrustedZoneImageRewardAddress","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"string","name":"ipfsHash","type":"string"}],"name":"publishImage","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"wallet","type":"address"}],"name":"removeAllowedWallet","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"string","name":"ipfsHash","type":"string"}],"name":"validateImage","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"stateMutability":"nonpayable","type":"constructor"},{"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"allowedWallets","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"ipfsHash","type":"string"}],"name":"getImageCertPublicKey","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"ipfsHash","type":"string"}],"name":"getImageSession","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"imageName","type":"string"},{"internalType":"string","name":"version","type":"string"}],"name":"getLatestImageVersionPublicKey","outputs":[{"internalType":"string","name":"","type":"string"},{"internalType":"string","name":"","type":"string"},{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"imageName","type":"string"},{"internalType":"string","name":"version","type":"string"}],"name":"getLatestTrustedZoneImageCertPublicKey","outputs":[{"internalType":"string","name":"","type":"string"},{"internalType":"string","name":"","type":"string"},{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"ipfsHash","type":"string"}],"name":"getRewardAddress","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"ipfsHash","type":"string"}],"name":"getTrustedZoneImageCertPublicKey","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"ipfsHash","type":"string"}],"name":"getTrustedZoneImageSession","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"ipfsHash","type":"string"}],"name":"getTrustedZoneRewardAddress","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"","type":"string"}],"name":"imageDetails","outputs":[{"internalType":"address","name":"owner","type":"address"},{"internalType":"string","name":"ipfsHash","type":"string"},{"internalType":"string","name":"version","type":"string"},{"internalType":"string","name":"session","type":"string"},{"internalType":"uint8","name":"fee","type":"uint8"},{"internalType":"address","name":"rewardAddress","type":"address"},{"internalType":"bool","name":"validated","type":"bool"},{"internalType":"bool","name":"published","type":"bool"},{"internalType":"string","name":"certPublicKey","type":"string"},{"internalType":"string","name":"dockerComposeHash","type":"string"},{"internalType":"string","name":"name","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"","type":"uint256"}],"name":"images","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"","type":"string"},{"internalType":"uint256","name":"","type":"uint256"}],"name":"imageVersions","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"","type":"string"},{"internalType":"string","name":"","type":"string"},{"internalType":"uint256","name":"","type":"uint256"}],"name":"imageVersionsHash","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"","type":"string"}],"name":"trustedZoneImageDetails","outputs":[{"internalType":"address","name":"owner","type":"address"},{"internalType":"string","name":"ipfsHash","type":"string"},{"internalType":"string","name":"version","type":"string"},{"internalType":"string","name":"session","type":"string"},{"internalType":"uint8","name":"fee","type":"uint8"},{"internalType":"address","name":"rewardAddress","type":"address"},{"internalType":"bool","name":"validated","type":"bool"},{"internalType":"bool","name":"published","type":"bool"},{"internalType":"string","name":"certPublicKey","type":"string"},{"internalType":"string","name":"dockerComposeHash","type":"string"},{"internalType":"string","name":"name","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"","type":"string"},{"internalType":"uint256","name":"","type":"uint256"}],"name":"trustedZoneImageVersions","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"","type":"string"},{"internalType":"string","name":"","type":"string"},{"internalType":"uint256","name":"","type":"uint256"}],"name":"trustedZoneVersionsHash","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"}]
+[{"inputs":[{"internalType":"string","name":"imageName","type":"string"}],"name":"imageNameOwner","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"wallet","type":"address"}],"name":"AllowedWalletAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"wallet","type":"address"}],"name":"AllowedWalletRemoved","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"string","name":"ipfsHash","type":"string"},{"indexed":false,"internalType":"string","name":"publicKey","type":"string"},{"indexed":false,"internalType":"string","name":"version","type":"string"}],"name":"ImageAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"string","name":"ipfsHash","type":"string"}],"name":"ImagePublished","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"string","name":"ipfsHash","type":"string"}],"name":"ImageRemoved","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"string","name":"ipfsHash","type":"string"}],"name":"ImageValidated","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"previousOwner","type":"address"},{"indexed":true,"internalType":"address","name":"newOwner","type":"address"}],"name":"OwnerChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"string","name":"ipfsHash","type":"string"}],"name":"TrustedZoneImageAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"string","name":"ipfsHash","type":"string"}],"name":"TrustedZoneImageRemoved","type":"event"},{"inputs":[{"internalType":"address","name":"wallet","type":"address"}],"name":"addAllowedWallet","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"string","name":"ipfsHash","type":"string"},{"internalType":"string","name":"certPublicKey","type":"string"},{"internalType":"string","name":"version","type":"string"},{"internalType":"string","name":"imageName","type":"string"},{"internalType":"string","name":"dockerComposeHash","type":"string"},{"internalType":"string","name":"session","type":"string"},{"internalType":"uint8","name":"fee","type":"uint8"}],"name":"addImage","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"string","name":"ipfsHash","type":"string"},{"internalType":"string","name":"certPublicKey","type":"string"},{"internalType":"string","name":"version","type":"string"},{"internalType":"string","name":"imageName","type":"string"},{"internalType":"string","name":"dockerComposeHash","type":"string"},{"internalType":"string","name":"session","type":"string"},{"internalType":"uint8","name":"fee","type":"uint8"}],"name":"addTrustedZoneImage","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"string","name":"ipfsHash","type":"string"},{"internalType":"address","name":"newRewardAddress","type":"address"}],"name":"changeImageRewardAddress","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"newOwner","type":"address"}],"name":"changeOwner","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"string","name":"ipfsHash","type":"string"},{"internalType":"address","name":"newRewardAddress","type":"address"}],"name":"changeTrustedZoneImageRewardAddress","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"string","name":"ipfsHash","type":"string"}],"name":"publishImage","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"wallet","type":"address"}],"name":"removeAllowedWallet","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"string","name":"ipfsHash","type":"string"}],"name":"validateImage","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"stateMutability":"nonpayable","type":"constructor"},{"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"allowedWallets","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"ipfsHash","type":"string"}],"name":"getImageCertPublicKey","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"ipfsHash","type":"string"}],"name":"getImageSession","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"imageName","type":"string"},{"internalType":"string","name":"version","type":"string"}],"name":"getLatestImageVersionPublicKey","outputs":[{"internalType":"string","name":"","type":"string"},{"internalType":"string","name":"","type":"string"},{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"imageName","type":"string"},{"internalType":"string","name":"version","type":"string"}],"name":"getLatestTrustedZoneImageCertPublicKey","outputs":[{"internalType":"string","name":"","type":"string"},{"internalType":"string","name":"","type":"string"},{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"ipfsHash","type":"string"}],"name":"getRewardAddress","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"ipfsHash","type":"string"}],"name":"getTrustedZoneImageCertPublicKey","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"ipfsHash","type":"string"}],"name":"getTrustedZoneImageSession","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"ipfsHash","type":"string"}],"name":"getTrustedZoneRewardAddress","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"","type":"string"}],"name":"imageDetails","outputs":[{"internalType":"address","name":"owner","type":"address"},{"internalType":"string","name":"ipfsHash","type":"string"},{"internalType":"string","name":"version","type":"string"},{"internalType":"string","name":"session","type":"string"},{"internalType":"uint8","name":"fee","type":"uint8"},{"internalType":"address","name":"rewardAddress","type":"address"},{"internalType":"bool","name":"validated","type":"bool"},{"internalType":"bool","name":"published","type":"bool"},{"internalType":"string","name":"certPublicKey","type":"string"},{"internalType":"string","name":"dockerComposeHash","type":"string"},{"internalType":"string","name":"name","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"","type":"uint256"}],"name":"images","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"","type":"string"},{"internalType":"uint256","name":"","type":"uint256"}],"name":"imageVersions","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"","type":"string"},{"internalType":"string","name":"","type":"string"},{"internalType":"uint256","name":"","type":"uint256"}],"name":"imageVersionsHash","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"","type":"string"}],"name":"trustedZoneImageDetails","outputs":[{"internalType":"address","name":"owner","type":"address"},{"internalType":"string","name":"ipfsHash","type":"string"},{"internalType":"string","name":"version","type":"string"},{"internalType":"string","name":"session","type":"string"},{"internalType":"uint8","name":"fee","type":"uint8"},{"internalType":"address","name":"rewardAddress","type":"address"},{"internalType":"bool","name":"validated","type":"bool"},{"internalType":"bool","name":"published","type":"bool"},{"internalType":"string","name":"certPublicKey","type":"string"},{"internalType":"string","name":"dockerComposeHash","type":"string"},{"internalType":"string","name":"name","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"","type":"string"},{"internalType":"uint256","name":"","type":"uint256"}],"name":"trustedZoneImageVersions","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"","type":"string"},{"internalType":"string","name":"","type":"string"},{"internalType":"uint256","name":"","type":"uint256"}],"name":"trustedZoneVersionsHash","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"string","name":"ipfsHash","type":"string"},{"indexed":false,"internalType":"string","name":"imageName","type":"string"},{"indexed":false,"internalType":"string","name":"version","type":"string"}],"name":"ImageCertSet","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"string","name":"ipfsHash","type":"string"},{"indexed":false,"internalType":"string","name":"imageName","type":"string"},{"indexed":false,"internalType":"string","name":"version","type":"string"},{"indexed":true,"internalType":"address","name":"owner","type":"address"},{"indexed":false,"internalType":"string","name":"ipfsPeer","type":"string"}],"name":"ImageRegistered","type":"event"},{"inputs":[],"name":"pendingImages","outputs":[{"internalType":"string[]","name":"","type":"string[]"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"ipfsHash","type":"string"},{"internalType":"string","name":"version","type":"string"},{"internalType":"string","name":"imageName","type":"string"},{"internalType":"string","name":"dockerComposeHash","type":"string"},{"internalType":"string","name":"session","type":"string"},{"internalType":"uint8","name":"fee","type":"uint8"},{"internalType":"string","name":"ipfsPeer","type":"string"}],"name":"registerImage","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"string","name":"ipfsHash","type":"string"}],"name":"registrationPeer","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"ipfsHash","type":"string"},{"internalType":"string","name":"certPublicKey","type":"string"}],"name":"setImageCert","outputs":[],"stateMutability":"nonpayable","type":"function"}]

package/pynithy/run/image_registry.js

@@ -1,25 +1,27 @@
 const Web3 = require('web3');
 const { ethers } = require('ethers');
-const { Account } = require('eth-lib/lib/account');
 const { config } = require('dotenv');
 const fs = require('fs');
 const path = require('path');
+const { isRevert, revertReason } = require('../../revert.js');
 
 config();
 
+// The publishing wallet's key comes from the environment only: a command line
+// is visible to other processes and is printed when the command fails.
 const PRIVATE_KEY = process.env.PRIVATE_KEY || "";
 let BLOCKCHAIN_NETWORK = process.env.BLOCKCHAIN_NETWORK || "Bloxberg_Testnet";
 let NETWORK_RPC = "https://bloxberg.ethernity.cloud";
-let IMAGE_REGISTRY_ADDRESS = "0x99A84C624C028bdf0a855A1E9E3f2fcf7275B3D8"; // bloxberg testnet (ECImageRegistryV2)
+let IMAGE_REGISTRY_ADDRESS = "0xa372a6e1Eb7Fcf343AF6b91E809b900C55001CD1"; // bloxberg testnet (ECImageRegistryV3)
 let CHAIN_ID = 8995;
 let GAS = 9000000;
 let GAS_PRICE = 1;
 
 function setVars(network = "") {
     if (BLOCKCHAIN_NETWORK.includes("Bloxberg")) {
-        // The bloxberg testnet reads ECImageRegistryV2; mainnet the original registry.
+        // The bloxberg testnet reads ECImageRegistryV3; mainnet the original registry.
         IMAGE_REGISTRY_ADDRESS = BLOCKCHAIN_NETWORK.includes("Testnet")
-            ? "0x99A84C624C028bdf0a855A1E9E3f2fcf7275B3D8"
+            ? "0xa372a6e1Eb7Fcf343AF6b91E809b900C55001CD1"
             : "0x15D73a742529C3fb11f3FA32EF7f0CC3870ACA31";
     } else if (BLOCKCHAIN_NETWORK.includes("Polygon")) {
         if (BLOCKCHAIN_NETWORK.includes("Mainnet")) {
@@ -58,6 +60,26 @@ function isStringPrivateKey(privateKey) {
     }
 }
 
+// The address of a private key given with or without its 0x prefix.
+function walletAddress(privateKey) {
+    return new ethers.Wallet(privateKey.startsWith("0x") ? privateKey : `0x${privateKey}`).address;
+}
+
+// REWARD_ADDRESS from the environment: where the image's developer fee is
+// paid when not the publishing wallet, or "" when unset. ECImageRegistryV3
+// refuses the zero address, so it is refused here before any transaction.
+function rewardAddressFromEnv() {
+    const rewardAddress = (process.env.REWARD_ADDRESS || "").trim();
+    if (!rewardAddress) return "";
+    if (!ethers.utils.isAddress(rewardAddress)) {
+        throw new Error(`REWARD_ADDRESS ${rewardAddress} is not an address`);
+    }
+    if (rewardAddress.toLowerCase() === ethers.constants.AddressZero) {
+        throw new Error("REWARD_ADDRESS is the zero address; leave it empty to be paid at the publishing wallet");
+    }
+    return rewardAddress;
+}
+
 async function checkAccountBalance() {
     try {
         const web3 = new ethers.providers.JsonRpcProvider(NETWORK_RPC);
@@ -124,61 +146,12 @@ class ImageRegistry {
         const receipt = await this.provider.sendTransaction(signedTxn.rawTransaction);
     }
 
+    // Record the securelock with its certificate on a V1 registry, in one
+    // addImage call. A failure, including the registry's refusal, throws.
     async addSecureLockImageCert(certContent, ipfsHash, imageName, version, dockerComposeHash, enclaveNameSecureLock, fee) {
-        try {
-            console.log("Adding secure lock image cert to image registry");
-            // Fetch current nonce
-            if (BLOCKCHAIN_NETWORK.includes("Polygon")) {
-                console.log("Polygon Mainnet");
-                let nonce = await this.provider.getTransactionCount(this.acct.address, 'pending');
-                // Fetch current gas price and increase it
-                let gasPrice = await this.provider.getGasPrice();
-                gasPrice = gasPrice.mul(ethers.BigNumber.from(110)).div(ethers.BigNumber.from(100));
-                const unicornTxn = await this.imageRegistryContract.addImage(
-                    ipfsHash, certContent, version, imageName, dockerComposeHash, enclaveNameSecureLock, fee,
-                    {
-                        nonce: nonce,
-                        gasPrice: gasPrice,
-                    });
-                // console.log("Transaction: ", unicornTxn);
-                const receipt = await this.imageRegistryContract.provider.waitForTransaction(unicornTxn.hash);
-
-                // console.log("transaction status: ", receipt.status);
-                console.log("transaction receipt: ", unicornTxn.hash);
-                if (receipt.status === 1) {
-                    console.log("Adding secure lock image cert transaction was successful!");
-                } else {
-                    // console.log("receipt.status", receipt.status)
-                    console.log("Image certificates already exist for this image!");
-                }
-            } else {
-                const unicornTxn = await this.imageRegistryContract.addImage(
-                    ipfsHash, certContent, version, imageName, dockerComposeHash, enclaveNameSecureLock, fee);
-                // console.log("Transaction: ", unicornTxn);
-                const receipt = await this.imageRegistryContract.provider.waitForTransaction(unicornTxn.hash);
-
-                // console.log("transaction status: ", receipt.status);
-                console.log("transaction receipt: ", unicornTxn.hash);
-                if (receipt.status === 1) {
-                    console.log("Adding secure lock image cert transaction was successful!");
-                } else {
-                    // console.log("receipt.status", receipt.status)
-                    console.log("Image certificates already exist for this image!");
-                }
-            }
-
-            // console.log("this.acct.address: ", this.acct.address);
-            // console.log("private key", PRIVATE_KEY);
-            // console.log('Getting nonce');
-            // const nonce = await this.imageRegistryContract.provider.getTransactionCount(this.acct.address);
-
-
-            // const signedTxn = await this.acct.signTransaction(unicornTxn);
-            // const receipt = await this.provider.sendTransaction(signedTxn.rawTransaction);
-        } catch (e) {
-            // console.error(e);
-            console.log("Image certificates already exist for this image!");
-        }
+        console.log("Adding secure lock image cert to image registry");
+        await this.write('addImage', ipfsHash, certContent, version, imageName, dockerComposeHash, enclaveNameSecureLock, fee);
+        console.log("Adding secure lock image cert transaction was successful!");
     }
 
     async getImagePublicKeyCert(ipfsHash) {
@@ -253,6 +226,18 @@ class ImageRegistry {
         const receipt = await this.provider.sendTransaction(signedTxn.rawTransaction);
     }
 
+    // Where the image's developer fee is paid. The registry records the
+    // publishing wallet at registration; only the image's owner changes it.
+    async setRewardAddress(ipfsHash, rewardAddress) {
+        const current = await this.imageRegistryContract.getRewardAddress(ipfsHash);
+        if (current.toLowerCase() === rewardAddress.toLowerCase()) {
+            console.log(`Reward address is already ${rewardAddress}`);
+            return;
+        }
+        console.log(`Setting the reward address to ${rewardAddress}`);
+        await this.write('changeImageRewardAddress', ipfsHash, rewardAddress);
+    }
+
     async getTrustedZoneCert(ipfsHash) {
         const cert = await this.imageRegistryContract.getTrustedZoneCert(ipfsHash);
         return cert;
@@ -283,14 +268,142 @@ class ImageRegistry {
             return ['', '', ''];
         }
     }
+
+    // Whether the registry is an ECImageRegistryV2 or later, which records an
+    // image before its certificate exists (registerImage, then setImageCert).
+    // A V1 registry has no pendingImages() and reverts; a node that does not
+    // answer is an error, not a V1 registry.
+    async isV2() {
+        try {
+            await this.imageRegistryContract.pendingImages();
+            return true;
+        } catch (e) {
+            if (isRevert(e)) return false;
+            throw e;
+        }
+    }
+
+    // The wallet that owns the securelock name on an ECImageRegistryV3 or
+    // later (the zero address while nobody does), or null on a registry
+    // without name owners. Only the owner publishes under the name, and a
+    // name and its -unsafe twin have one owner.
+    async imageNameOwner(imageName) {
+        try {
+            return await this.imageRegistryContract.imageNameOwner(imageName);
+        } catch (e) {
+            if (isRevert(e)) return null;
+            throw e;
+        }
+    }
+
+    // Send `method(...args)` from the publishing wallet. It is simulated
+    // first, so a call the registry refuses stops here with the registry's
+    // reason, then sent with its gas estimate plus 30%: what a registry write
+    // costs depends on the pending list, which other publishers change
+    // between the estimate and the block.
+    async write(method, ...args) {
+        try {
+            await this.imageRegistryContract.callStatic[method](...args);
+        } catch (e) {
+            throw new Error(`the image registry refuses ${method}: ${revertReason(e, this.imageRegistryContract.interface)}`);
+        }
+        const gas = await this.imageRegistryContract.estimateGas[method](...args);
+        const overrides = { gasLimit: gas.mul(13).div(10) };
+        if (BLOCKCHAIN_NETWORK.includes("Polygon")) {
+            overrides.nonce = await this.provider.getTransactionCount(this.acct.address, 'pending');
+            overrides.gasPrice = (await this.provider.getGasPrice()).mul(110).div(100);
+        }
+        const tx = await this.imageRegistryContract[method](...args, overrides);
+        const receipt = await this.imageRegistryContract.provider.waitForTransaction(tx.hash);
+        console.log("transaction receipt: ", tx.hash);
+        if (receipt.status !== 1) {
+            throw new Error(`${method} reverted (${tx.hash})`);
+        }
+    }
+
+    // Record the securelock on a V2 registry before its certificate exists:
+    // name, protocol version v3, compose, session, the publisher's fee and the
+    // IPFS node that holds the image (a multiaddr, or ""). A hash this wallet
+    // already registered with the same name, compose and session is left as
+    // it is; a hash another wallet registered is refused, and so is a name
+    // another wallet owns. The record cannot be changed, so a hash registered
+    // with another compose or session is refused too: the nodes would fetch
+    // the compose the record names.
+    async registerImage(ipfsHash, imageName, dockerComposeHash, session, fee, ipfsPeer) {
+        const details = await this.imageRegistryContract.imageDetails(ipfsHash);
+        if (details.owner !== ethers.constants.AddressZero) {
+            if (details.owner.toLowerCase() !== this.acct.address.toLowerCase()) {
+                throw new Error(`${ipfsHash} is registered by ${details.owner}, not by this wallet`);
+            }
+            const differing = [
+                ['name', details.name, imageName],
+                ['compose', details.dockerComposeHash, dockerComposeHash],
+                ['session', details.session, session],
+            ].filter(([, recorded, wanted]) => recorded !== wanted);
+            if (differing.length) {
+                const recorded = differing.map(([field, value]) => `${field} ${value}`).join(', ');
+                const wanted = differing.map(([field, , value]) => `${field} ${value}`).join(', ');
+                throw new Error(`${ipfsHash} is registered with ${recorded}, and this publish has ${wanted}; run ecld-build to publish a new version`);
+            }
+            console.log(`${ipfsHash} is already registered`);
+            return false;
+        }
+        const nameOwner = await this.imageNameOwner(imageName);
+        if (nameOwner && nameOwner !== ethers.constants.AddressZero
+            && nameOwner.toLowerCase() !== this.acct.address.toLowerCase()) {
+            throw new Error(`the image name ${imageName} belongs to ${nameOwner}; publish under another PROJECT_NAME`);
+        }
+        console.log(`Registering ${imageName} v3 as ${ipfsHash} (compose ${dockerComposeHash}, peer ${ipfsPeer || 'none'})`);
+        await this.write('registerImage',
+            ipfsHash, "v3", imageName, dockerComposeHash, session, Number(fee), ipfsPeer || "");
+        return true;
+    }
+
+    // Write the certificate of a registered image, once, from the wallet that
+    // registered it. A certificate already there is left as it is. The RPC
+    // endpoint balances requests over nodes that can lag the chain by several
+    // blocks, and a read can fail outright, so an image this publish
+    // registered minutes earlier can read as missing, or be refused as "Image
+    // not found" by the simulation: both are tried again every 15 seconds for
+    // `waitMs` before the image is called missing.
+    async setImageCert(ipfsHash, cert, waitMs = 600000) {
+        const deadline = Date.now() + waitMs;
+        for (;;) {
+            let details = null;
+            try {
+                details = await this.imageRegistryContract.imageDetails(ipfsHash);
+            } catch (e) {
+                if (Date.now() >= deadline) throw e;
+            }
+            if (details && details.owner !== ethers.constants.AddressZero) {
+                if (details.certPublicKey) {
+                    if (details.certPublicKey.trim() === cert.trim()) {
+                        console.log(`The certificate of ${ipfsHash} is already registered`);
+                        return false;
+                    }
+                    throw new Error(`${ipfsHash} already has a certificate, and it differs from the extracted one`);
+                }
+                try {
+                    console.log(`Registering the certificate of ${ipfsHash}`);
+                    await this.write('setImageCert', ipfsHash, cert);
+                    return true;
+                } catch (e) {
+                    if (!(e.message || '').includes('Image not found') || Date.now() >= deadline) throw e;
+                }
+            } else if (details && Date.now() >= deadline) {
+                throw new Error(`${ipfsHash} is not registered`);
+            }
+            await new Promise((resolve) => setTimeout(resolve, 15000));
+        }
+    }
 }
 
 (async () => {
     try {
-        const [networkName, projectName, version, privateKey, action] = process.argv.slice(2);
+        const [networkName, projectName, version, action] = process.argv.slice(2);
         if (action === "validateAddress") {
-            if (privateKey) {
-                console.log(isStringPrivateKey(privateKey));
+            if (PRIVATE_KEY) {
+                console.log(isStringPrivateKey(PRIVATE_KEY));
             }
             process.exit(0);
         }
@@ -304,8 +417,8 @@ class ImageRegistry {
             process.exit(0);
         }
         // The certificate of the trustedzone's own record. getLatestImageVersionPublicKey
-        // reads the securelock records instead: ECImageRegistryV2 reverts it for
-        // a trustedzone, and the bloxberg mainnet and LitVM registries return a
+        // reads the securelock records instead: ECImageRegistryV2 and V3 revert it
+        // for a trustedzone, and the bloxberg mainnet and LitVM registries return a
         // different certificate for the same name.
         if (action === 'getTrustedZoneCert') {
             const imageRegistry = new ImageRegistry();
@@ -328,6 +441,47 @@ class ImageRegistry {
         }
 
         const imageRegistry = new ImageRegistry();
+        // Whether the registry records images before their certificate.
+        if (action === 'isV2') {
+            try {
+                console.log((await imageRegistry.isV2()) ? 'true' : 'false');
+            } catch (e) {
+                console.error(`Could not read the image registry ${IMAGE_REGISTRY_ADDRESS}: ${e.reason || e.message}`);
+                process.exit(1);
+            }
+            process.exit(0);
+        }
+        // Record the image before its certificate (V2): IPFS_HASH,
+        // IPFS_DOCKER_COMPOSE_HASH, PROJECT_NAME (the name registered),
+        // ENCLAVE_NAME_SECURELOCK (the session), DEVELOPER_FEE and IPFS_PEER
+        // (the publish's node) come from the environment.
+        if (action === 'registerImage') {
+            try {
+                const rewardAddress = rewardAddressFromEnv();
+                await imageRegistry.registerImage(
+                    process.env.IPFS_HASH || "", process.env.PROJECT_NAME || "",
+                    process.env.IPFS_DOCKER_COMPOSE_HASH || "", process.env.ENCLAVE_NAME_SECURELOCK || "",
+                    process.env.DEVELOPER_FEE || "0", process.env.IPFS_PEER || "");
+                if (rewardAddress) {
+                    await imageRegistry.setRewardAddress(process.env.IPFS_HASH || "", rewardAddress);
+                }
+            } catch (e) {
+                console.error(`Could not register the image: ${e.reason || e.message}`);
+                process.exit(1);
+            }
+            process.exit(0);
+        }
+        // Write the extracted certificate of a registered image (V2).
+        if (action === 'setImageCert') {
+            try {
+                const cert = fs.readFileSync("./registry/certificate.securelock.crt", 'utf8');
+                await imageRegistry.setImageCert(process.env.IPFS_HASH || "", cert);
+            } catch (e) {
+                console.error(`Could not register the certificate: ${e.reason || e.message}`);
+                process.exit(1);
+            }
+            process.exit(0);
+        }
         if (action === 'registerSecureLockImage') {
             const secureLock = fs.readFileSync("./registry/certificate.securelock.crt", 'utf8');
             // console.log("SECURELOCK:", secureLock);
@@ -357,7 +511,28 @@ class ImageRegistry {
             if (enclaveVersion && enclaveVersion !== "v3") versionKeys.push(enclaveVersion);
             for (const versionKey of versionKeys) {
                 console.log(`Registering securelock under version '${versionKey}'`);
-                await imageRegistry.addSecureLockImageCert(secureLock, ipfsHash, imageName, versionKey, ipfsDockerComposeHash, enclaveNameSecureLock, fee);
+                try {
+                    await imageRegistry.addSecureLockImageCert(secureLock, ipfsHash, imageName, versionKey, ipfsDockerComposeHash, enclaveNameSecureLock, fee);
+                } catch (e) {
+                    // The registry refuses a hash the (name, version) channel already holds.
+                    if ((e.message || '').includes('Image hash is already in registry')) {
+                        console.log(`The securelock is already registered under version '${versionKey}'`);
+                        continue;
+                    }
+                    console.error(`Could not register the securelock under version '${versionKey}': ${e.reason || e.message}`);
+                    process.exit(1);
+                }
+            }
+            // REWARD_ADDRESS: where the image's developer fee is paid, when not
+            // the publishing wallet.
+            try {
+                const rewardAddress = rewardAddressFromEnv();
+                if (rewardAddress) {
+                    await imageRegistry.setRewardAddress(ipfsHash, rewardAddress);
+                }
+            } catch (e) {
+                console.error(`Could not set the reward address: ${e.reason || e.message}`);
+                process.exit(1);
             }
             process.exit(0);
         }
@@ -367,6 +542,22 @@ class ImageRegistry {
             process.exit(0);
         }
         console.log(`Checking image: '${projectName}' on the ${networkName} blockchain...`);
+        // On a registry with name owners the name's owner answers, whether or
+        // not an image is certified under the name yet.
+        const nameOwner = await imageRegistry.imageNameOwner(projectName);
+        if (nameOwner !== null) {
+            if (nameOwner === ethers.constants.AddressZero) {
+                console.log(`Image: '${projectName}' is available on the ${networkName} blockchain.`);
+                process.exit(0);
+            }
+            if (PRIVATE_KEY && isStringPrivateKey(PRIVATE_KEY) === "OK"
+                && walletAddress(PRIVATE_KEY).toLowerCase() !== nameOwner.toLowerCase()) {
+                console.log(`!!! Image: '${projectName}' is owned by '${nameOwner}'.\nYou are not the account holder of the image.\nPlease change the project name and try again.\n`);
+                process.exit(1);
+            }
+            console.log(`Image: '${projectName}' is owned by '${nameOwner}'.\nIf you are not the account holder, you will not be able to publish your project with the current name. Please change the project name and try again.\n`);
+            process.exit(0);
+        }
         const imageHash = (await imageRegistry._getLatestImageVersionPublicKey(projectName, version))[0];
         console.log(`Image hash: ${imageHash}`);
         if (!imageHash) {
@@ -375,10 +566,9 @@ class ImageRegistry {
         }
         const imageOwner = (await imageRegistry.getImageDetails(imageHash))[0];
 
-        if (privateKey) {
-            if (isStringPrivateKey(privateKey) === "OK") {
-                const account = Account.fromPrivate(privateKey);
-                if (imageOwner !== account.address) {
+        if (PRIVATE_KEY) {
+            if (isStringPrivateKey(PRIVATE_KEY) === "OK") {
+                if (imageOwner.toLowerCase() !== walletAddress(PRIVATE_KEY).toLowerCase()) {
                     console.log(`!!! Image: '${projectName}' is owned by '${imageOwner}'.\nYou are not the account holder of the image.\nPlease change the project name and try again.\n`);
                     process.exit(1);
                 }