@halot/cli 1.0.1 → 1.0.3

package/README.md

@@ -27,6 +27,8 @@ npx @halot/cli --help
 
 ```bash
 halot provider init
+halot provider init --testnet
+halot provider init --mainnet
 ```
 
 This creates:
@@ -42,19 +44,15 @@ This creates:
     "0g:testnet": {
       "privateKey": "0x..."
     },
-    "0g:mainnet": {
-      "privateKey": "0x..."
-    },
     "stellar:testnet": {
       "privateKey": "S..."
-    },
-    "stellar:mainnet": {
-      "privateKey": "S..."
     }
   }
 }
 ```
 
+The default is `--testnet`. `--mainnet` generates the equivalent `0g:mainnet` and `stellar:mainnet` scoped workspace without adding testnet entries.
+
 `halot.provider.json` stores provider identity, the selected Halot actor authority, and settlement wallets:
 
 ```json
@@ -77,9 +75,7 @@ This creates:
   },
   "settlementWallets": {
     "0g:testnet": "0x...",
-    "0g:mainnet": "0x...",
-    "stellar:testnet": "G...",
-    "stellar:mainnet": "G..."
+    "stellar:testnet": "G..."
   }
 }
 ```
@@ -275,9 +271,7 @@ This creates:
   },
   "settlementWallets": {
     "0g:testnet": "0x...",
-    "0g:mainnet": "0x...",
-    "stellar:testnet": "G...",
-    "stellar:mainnet": "G..."
+    "stellar:testnet": "G..."
   },
   "stake": {
     "amount": "1000",
@@ -300,8 +294,7 @@ This creates:
     "verifiability": "TeeML"
   },
   "sdk": {
-    "network": "testnet",
-    "rpcUrl": "https://evmrpc-testnet.0g.ai"
+    "network": "testnet"
   },
   "timeout": 60
 }

package/dist/features/provider/provider-init.command.js

@@ -3,11 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.runProviderInitCommand = runProviderInitCommand;
 const wallet_manager_1 = require("@halot/cli/shared/wallet/wallet.manager");
 const authority_util_1 = require("@halot/cli/shared/wallet/authority.util");
+const init_cluster_util_1 = require("@halot/cli/shared/wallet/init-cluster.util");
 const workspace_service_1 = require("@halot/cli/shared/workspace/workspace.service");
-async function runProviderInitCommand() {
+async function runProviderInitCommand(options = {}) {
+    const cluster = (0, init_cluster_util_1.resolveInitCluster)(options);
+    const authorities = (0, init_cluster_util_1.describeClusterAuthorities)(cluster);
     const workspace = new workspace_service_1.WorkspaceService();
     const walletManager = new wallet_manager_1.WalletManager(workspace);
-    const wallets = walletManager.createWallets();
+    const wallets = walletManager.createWallets(cluster);
     workspace.writeProviderConfig({
         providerId: '',
         displayName: 'My Provider',
@@ -17,17 +20,17 @@ async function runProviderInitCommand() {
             erc8004TokenId: '',
             agentRegistry: '',
             agentUri: '',
-            ownerAddress: (0, authority_util_1.resolveAuthorityAddress)(wallets, '0g:testnet'),
+            ownerAddress: (0, authority_util_1.resolveAuthorityAddress)(wallets, authorities.zeroG),
             domain: 'myprovider.0g',
             domainType: 'space-id',
         },
         authority: {
             path: './wallets.json',
-            actor: '0g:testnet',
+            actor: authorities.zeroG,
         },
         settlementWallets: (0, authority_util_1.createDefaultSettlementWallets)(wallets),
     });
-    console.log('Provider workspace initialized.');
-    console.log(`0G testnet authority: ${(0, authority_util_1.resolveAuthorityAddress)(wallets, '0g:testnet')}`);
-    console.log(`Stellar testnet authority: ${(0, authority_util_1.resolveAuthorityAddress)(wallets, 'stellar:testnet')}`);
+    console.log(`Provider ${cluster} workspace initialized.`);
+    console.log(`${authorities.zeroG} authority: ${(0, authority_util_1.resolveAuthorityAddress)(wallets, authorities.zeroG)}`);
+    console.log(`${authorities.stellar} authority: ${(0, authority_util_1.resolveAuthorityAddress)(wallets, authorities.stellar)}`);
 }

package/dist/features/requester/requester-init.command.js

@@ -3,20 +3,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.runRequesterInitCommand = runRequesterInitCommand;
 const wallet_manager_1 = require("@halot/cli/shared/wallet/wallet.manager");
 const authority_util_1 = require("@halot/cli/shared/wallet/authority.util");
+const init_cluster_util_1 = require("@halot/cli/shared/wallet/init-cluster.util");
 const workspace_service_1 = require("@halot/cli/shared/workspace/workspace.service");
-async function runRequesterInitCommand() {
+async function runRequesterInitCommand(options = {}) {
+    const cluster = (0, init_cluster_util_1.resolveInitCluster)(options);
+    const authorities = (0, init_cluster_util_1.describeClusterAuthorities)(cluster);
     const workspace = new workspace_service_1.WorkspaceService();
     const walletManager = new wallet_manager_1.WalletManager(workspace);
-    const wallets = walletManager.createWallets();
+    const wallets = walletManager.createWallets(cluster);
     workspace.writeRequesterConfig({
         requesterId: '',
         displayName: 'Halot Requester',
         authority: {
             path: './wallets.json',
-            actor: '0g:testnet',
+            actor: authorities.zeroG,
         },
     });
-    console.log('Requester workspace initialized.');
-    console.log(`0G testnet authority: ${(0, authority_util_1.resolveAuthorityAddress)(wallets, '0g:testnet')}`);
-    console.log(`Stellar testnet authority: ${(0, authority_util_1.resolveAuthorityAddress)(wallets, 'stellar:testnet')}`);
+    console.log(`Requester ${cluster} workspace initialized.`);
+    console.log(`${authorities.zeroG} authority: ${(0, authority_util_1.resolveAuthorityAddress)(wallets, authorities.zeroG)}`);
+    console.log(`${authorities.stellar} authority: ${(0, authority_util_1.resolveAuthorityAddress)(wallets, authorities.stellar)}`);
 }

package/dist/features/verifier/verifier-init.command.js

@@ -3,11 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.runVerifierInitCommand = runVerifierInitCommand;
 const wallet_manager_1 = require("@halot/cli/shared/wallet/wallet.manager");
 const authority_util_1 = require("@halot/cli/shared/wallet/authority.util");
+const init_cluster_util_1 = require("@halot/cli/shared/wallet/init-cluster.util");
 const workspace_service_1 = require("@halot/cli/shared/workspace/workspace.service");
-async function runVerifierInitCommand() {
+async function runVerifierInitCommand(options = {}) {
+    const cluster = (0, init_cluster_util_1.resolveInitCluster)(options);
+    const authorities = (0, init_cluster_util_1.describeClusterAuthorities)(cluster);
     const workspace = new workspace_service_1.WorkspaceService();
     const walletManager = new wallet_manager_1.WalletManager(workspace);
-    const wallets = walletManager.createWallets();
+    const wallets = walletManager.createWallets(cluster);
     workspace.writeVerifierConfig({
         verifierId: '',
         displayName: 'My Verifier',
@@ -16,13 +19,13 @@ async function runVerifierInitCommand() {
             erc8004TokenId: '',
             agentRegistry: '',
             agentUri: '',
-            ownerAddress: (0, authority_util_1.resolveAuthorityAddress)(wallets, '0g:testnet'),
+            ownerAddress: (0, authority_util_1.resolveAuthorityAddress)(wallets, authorities.zeroG),
             domain: 'myverifier.0g',
             domainType: 'space-id',
         },
         authority: {
             path: './wallets.json',
-            actor: '0g:testnet',
+            actor: authorities.zeroG,
         },
         settlementWallets: (0, authority_util_1.createDefaultSettlementWallets)(wallets),
         stake: {
@@ -41,7 +44,7 @@ async function runVerifierInitCommand() {
             verifiability: 'TeeML',
         },
         sdk: {
-            network: 'testnet',
+            network: cluster,
         },
         timeout: 60,
     });
@@ -63,7 +66,7 @@ async function runVerifierInitCommand() {
         maxConcurrentJobs: 5,
         minConfidenceThreshold: 0.75,
     });
-    console.log('Verifier workspace initialized.');
-    console.log(`0G testnet authority: ${(0, authority_util_1.resolveAuthorityAddress)(wallets, '0g:testnet')}`);
-    console.log(`Stellar testnet authority: ${(0, authority_util_1.resolveAuthorityAddress)(wallets, 'stellar:testnet')}`);
+    console.log(`Verifier ${cluster} workspace initialized.`);
+    console.log(`${authorities.zeroG} authority: ${(0, authority_util_1.resolveAuthorityAddress)(wallets, authorities.zeroG)}`);
+    console.log(`${authorities.stellar} authority: ${(0, authority_util_1.resolveAuthorityAddress)(wallets, authorities.stellar)}`);
 }

package/dist/index.js

@@ -43,9 +43,15 @@ program
 const requester = program.command('requester').description('Requester workspace');
 requester
     .command('init')
+    .option('--testnet', 'Initialize a testnet requester workspace', false)
+    .option('--mainnet', 'Initialize a mainnet requester workspace', false)
     .action(requester_init_command_1.runRequesterInitCommand);
 const provider = program.command('provider').description('Provider workspace');
-provider.command('init').action(provider_init_command_1.runProviderInitCommand);
+provider
+    .command('init')
+    .option('--testnet', 'Initialize a testnet provider workspace', false)
+    .option('--mainnet', 'Initialize a mainnet provider workspace', false)
+    .action(provider_init_command_1.runProviderInitCommand);
 provider
     .command('register')
     .option('--server <url>', 'Halot server url', defaultServerUrl)
@@ -92,7 +98,11 @@ service
     .option('--server <url>', 'Halot server url', defaultServerUrl)
     .action(service_remove_command_1.runServiceRemoveCommand);
 const verifier = program.command('verifier').description('Verifier workspace');
-verifier.command('init').action(verifier_init_command_1.runVerifierInitCommand);
+verifier
+    .command('init')
+    .option('--testnet', 'Initialize a testnet verifier workspace', false)
+    .option('--mainnet', 'Initialize a mainnet verifier workspace', false)
+    .action(verifier_init_command_1.runVerifierInitCommand);
 verifier
     .command('register')
     .option('--server <url>', 'Halot server url', defaultServerUrl)

package/dist/shared/wallet/authority.util.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveClusterAuthorities = resolveClusterAuthorities;
 exports.resolveAuthorityWallet = resolveAuthorityWallet;
 exports.resolveActorWallet = resolveActorWallet;
 exports.resolveAuthorityAddress = resolveAuthorityAddress;
@@ -10,8 +11,18 @@ exports.isMainnetAuthority = isMainnetAuthority;
 const stellar_sdk_1 = require("@stellar/stellar-sdk");
 const ethers_1 = require("ethers");
 const sdk_1 = require("@halot/sdk");
+function resolveClusterAuthorities(cluster) {
+    return {
+        zeroG: `0g:${cluster}`,
+        stellar: `stellar:${cluster}`,
+    };
+}
 function resolveAuthorityWallet(wallets, authority) {
-    return wallets.authorities[authority];
+    const wallet = wallets.authorities[authority];
+    if (!wallet) {
+        throw new Error(`Wallet authority ${authority} is missing from wallets.json`);
+    }
+    return wallet;
 }
 function resolveActorWallet(wallets, authority) {
     return new ethers_1.Wallet(resolveAuthorityWallet(wallets, authority).privateKey);
@@ -30,12 +41,12 @@ function deriveVerifierSigningPublicKey(wallets, authority) {
     return new ethers_1.SigningKey(resolveAuthorityWallet(wallets, asZeroGAuthority(authority)).privateKey).publicKey;
 }
 function createDefaultSettlementWallets(wallets) {
-    return {
-        '0g:testnet': resolveAuthorityAddress(wallets, '0g:testnet'),
-        '0g:mainnet': resolveAuthorityAddress(wallets, '0g:mainnet'),
-        'stellar:testnet': resolveAuthorityAddress(wallets, 'stellar:testnet'),
-        'stellar:mainnet': resolveAuthorityAddress(wallets, 'stellar:mainnet'),
-    };
+    return sdk_1.settlementNetworkValues.reduce((settlementWallets, network) => {
+        if (wallets.authorities[network]) {
+            settlementWallets[network] = resolveAuthorityAddress(wallets, network);
+        }
+        return settlementWallets;
+    }, {});
 }
 function resolveZeroGAuthorityProfile(authority) {
     return (0, sdk_1.resolveZeroGAuthorityProfile)(asZeroGAuthority(authority));

package/dist/shared/wallet/init-cluster.util.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveInitCluster = resolveInitCluster;
+exports.describeClusterAuthorities = describeClusterAuthorities;
+const authority_util_1 = require("@halot/cli/shared/wallet/authority.util");
+function resolveInitCluster(options = {}) {
+    if (options.testnet && options.mainnet) {
+        throw new Error('Choose either --testnet or --mainnet, not both.');
+    }
+    return options.mainnet ? 'mainnet' : 'testnet';
+}
+function describeClusterAuthorities(cluster) {
+    const authorities = (0, authority_util_1.resolveClusterAuthorities)(cluster);
+    return {
+        zeroG: authorities.zeroG,
+        stellar: authorities.stellar,
+    };
+}

package/dist/shared/wallet/wallet.manager.js

@@ -4,29 +4,23 @@ exports.WalletManager = void 0;
 const stellar_sdk_1 = require("@stellar/stellar-sdk");
 const ethers_1 = require("ethers");
 const workspace_service_1 = require("@halot/cli/shared/workspace/workspace.service");
+const authority_util_1 = require("@halot/cli/shared/wallet/authority.util");
 class WalletManager {
     workspaceService;
     constructor(workspaceService = new workspace_service_1.WorkspaceService()) {
         this.workspaceService = workspaceService;
     }
-    createWallets() {
-        const zeroGTestnetWallet = ethers_1.Wallet.createRandom();
-        const zeroGMainnetWallet = ethers_1.Wallet.createRandom();
-        const stellarTestnetWallet = stellar_sdk_1.Keypair.random();
-        const stellarMainnetWallet = stellar_sdk_1.Keypair.random();
+    createWallets(cluster = 'testnet') {
+        const zeroGWallet = ethers_1.Wallet.createRandom();
+        const stellarWallet = stellar_sdk_1.Keypair.random();
+        const authorities = (0, authority_util_1.resolveClusterAuthorities)(cluster);
         const wallets = {
             authorities: {
-                '0g:testnet': {
-                    privateKey: zeroGTestnetWallet.privateKey,
+                [authorities.zeroG]: {
+                    privateKey: zeroGWallet.privateKey,
                 },
-                '0g:mainnet': {
-                    privateKey: zeroGMainnetWallet.privateKey,
-                },
-                'stellar:testnet': {
-                    privateKey: stellarTestnetWallet.secret(),
-                },
-                'stellar:mainnet': {
-                    privateKey: stellarMainnetWallet.secret(),
+                [authorities.stellar]: {
+                    privateKey: stellarWallet.secret(),
                 },
             },
         };

package/dist/shared/workspace/workspace.service.js

@@ -144,13 +144,15 @@ class WorkspaceService {
 exports.WorkspaceService = WorkspaceService;
 function normalizeWalletBundle(input) {
     if (isRecord(input) && isRecord(input.authorities)) {
+        const authorities = {};
+        for (const network of sdk_1.settlementNetworkValues) {
+            const entry = input.authorities[network];
+            if (entry !== undefined) {
+                authorities[network] = normalizeAuthorityEntry(entry);
+            }
+        }
         return {
-            authorities: {
-                '0g:testnet': normalizeAuthorityEntry(input.authorities['0g:testnet']),
-                '0g:mainnet': normalizeAuthorityEntry(input.authorities['0g:mainnet']),
-                'stellar:testnet': normalizeAuthorityEntry(input.authorities['stellar:testnet']),
-                'stellar:mainnet': normalizeAuthorityEntry(input.authorities['stellar:mainnet']),
-            },
+            authorities,
         };
     }
     if (isRecord(input) && input.zeroG && input.stellar) {
@@ -159,9 +161,7 @@ function normalizeWalletBundle(input) {
         return {
             authorities: {
                 '0g:testnet': zeroG,
-                '0g:mainnet': zeroG,
                 'stellar:testnet': stellar,
-                'stellar:mainnet': stellar,
             },
         };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@halot/cli",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "Halot protocol CLI",
   "main": "dist/index.js",
   "bin": {
@@ -30,7 +30,7 @@
     "./*": "./dist/*.js"
   },
   "dependencies": {
-    "@halot/sdk": "^1.0.1",
+    "@halot/sdk": "^1.0.2",
     "@stellar/stellar-sdk": "^15.0.1",
     "@web3-name-sdk/core": "^0.1.18",
     "commander": "^14.0.3",