@btc-vision/cli 1.0.8 → 1.0.9

package/build/commands/DeprecateCommand.js

@@ -1,6 +1,6 @@
 import { confirm, input } from '@inquirer/prompts';
 import { BaseCommand } from './BaseCommand.js';
-import { getPackage, getRegistryContract, getVersion, isVersionImmutable, } from '../lib/registry.js';
+import { getPackage, getRegistryContract, getVersion, isVersionImmutable } from '../lib/registry.js';
 import { canSign, loadCredentials } from '../lib/credentials.js';
 import { CLIWallet } from '../lib/wallet.js';
 import { buildTransactionParams, checkBalance, formatSats, getWalletAddress, } from '../lib/transaction.js';

package/build/commands/DomainCommand.js

@@ -3,7 +3,7 @@ import { confirm } from '@inquirer/prompts';
 import { Logger } from '@btc-vision/logger';
 import { CLIWallet } from '../lib/wallet.js';
 import { canSign, loadCredentials } from '../lib/credentials.js';
-import { getContenthash, getContenthashTypeName, getDomain, getDomainPrice, getResolverContract, getTreasuryAddress, parseDomainName, validateDomainName, } from '../lib/resolver.js';
+import { getResolverContract, getDomain, getContenthash, getContenthashTypeName, validateDomainName, getTreasuryAddress, getDomainPrice, parseDomainName, } from '../lib/resolver.js';
 import { buildTransactionParams, checkBalance, DEFAULT_FEE_RATE, DEFAULT_MAX_SAT_TO_SPEND, formatSats, getWalletAddress, waitForTransactionConfirmation, } from '../lib/transaction.js';
 import { TransactionOutputFlags } from 'opnet';
 const logger = new Logger();
@@ -67,7 +67,6 @@ async function registerDomain(domain, options) {
         logger.log(`Treasury:     ${treasuryAddr}`);
         logger.log(`Network:      ${network}`);
         logger.log(`Your wallet:  ${wallet.p2trAddress}`);
-        logger.log(`MLDSA Public Key Hash:  ${wallet.address.toHex()}`);
         logger.log('');
         if (options.dryRun) {
             logger.warn('Dry run - no changes made.');
@@ -223,7 +222,8 @@ async function domainInfo(domain, options) {
         process.exit(1);
     }
 }
-const domainCommand = new Command('domain').description('Manage .btc domains');
+const domainCommand = new Command('domain')
+    .description('Manage .btc domains');
 domainCommand
     .command('register')
     .description('Register a new .btc domain')

package/build/commands/InstallCommand.d.ts

@@ -3,5 +3,7 @@ export declare class InstallCommand extends BaseCommand {
     constructor();
     protected configure(): void;
     private execute;
+    private removeOldVersions;
+    private escapeRegex;
 }
 export declare const installCommand: import("commander").Command;

package/build/commands/InstallCommand.js

@@ -106,8 +106,10 @@ export class InstallCommand extends BaseCommand {
             }
             const outputDir = options?.output || path.join(process.cwd(), 'plugins');
             fs.mkdirSync(outputDir, { recursive: true });
-            const fileName = `${packageName.replace(/^@/, '').replace(/\//g, '-')}-${version}.opnet`;
+            const packageBaseName = packageName.replace(/^@/, '').replace(/\//g, '-');
+            const fileName = `${packageBaseName}-${version}.opnet`;
             const outputPath = path.join(outputDir, fileName);
+            this.removeOldVersions(outputDir, packageBaseName, version);
             this.logger.info('Saving plugin...');
             fs.writeFileSync(outputPath, result.data);
             this.logger.success('Plugin installed');
@@ -126,5 +128,31 @@ export class InstallCommand extends BaseCommand {
             this.exitWithError(this.formatError(error));
         }
     }
+    removeOldVersions(outputDir, packageBaseName, newVersion) {
+        try {
+            const entries = fs.readdirSync(outputDir, { withFileTypes: true });
+            for (const entry of entries) {
+                if (!entry.isFile() || !entry.name.endsWith('.opnet')) {
+                    continue;
+                }
+                const pattern = new RegExp(`^${this.escapeRegex(packageBaseName)}-(.+)\\.opnet$`);
+                const match = entry.name.match(pattern);
+                if (match) {
+                    const oldVersion = match[1];
+                    if (oldVersion !== newVersion) {
+                        const oldFilePath = path.join(outputDir, entry.name);
+                        this.logger.info(`Removing old version: ${entry.name}`);
+                        fs.unlinkSync(oldFilePath);
+                    }
+                }
+            }
+        }
+        catch (error) {
+            this.logger.warn(`Could not clean up old versions: ${this.formatError(error)}`);
+        }
+    }
+    escapeRegex(str) {
+        return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    }
 }
 export const installCommand = new InstallCommand().getCommand();

package/build/commands/LoginCommand.js

@@ -76,9 +76,9 @@ export class LoginCommand extends BaseCommand {
                 network: options.network,
             };
         }
-        return this.interactiveLogin(options.network, mldsaLevel);
+        return this.interactiveLogin(options.network);
     }
-    async interactiveLogin(defaultNetwork, defaultLevel) {
+    async interactiveLogin(defaultNetwork) {
         this.logger.info('OPNet Wallet Configuration\n');
         const loginMethod = await select({
             message: 'How would you like to authenticate?',
@@ -104,27 +104,8 @@ export class LoginCommand extends BaseCommand {
             ],
             default: defaultNetwork,
         }));
-        const selectedLevel = (await select({
-            message: 'Select MLDSA security level:',
-            choices: [
-                {
-                    name: 'MLDSA-44 (Level 2, fastest)',
-                    value: 44,
-                    description: '1312 byte public key',
-                },
-                {
-                    name: 'MLDSA-65 (Level 3, balanced)',
-                    value: 65,
-                    description: '1952 byte public key',
-                },
-                {
-                    name: 'MLDSA-87 (Level 5, most secure)',
-                    value: 87,
-                    description: '2592 byte public key',
-                },
-            ],
-            default: defaultLevel,
-        }));
+        const selectedLevel = 44;
+        this.logger.info('Using MLDSA-44 (only supported level on OPNet)');
         if (loginMethod === 'mnemonic') {
             const mnemonic = await password({
                 message: 'Enter your mnemonic phrase (12 or 24 words):',

package/build/commands/UndeprecateCommand.js

@@ -1,6 +1,6 @@
 import { confirm } from '@inquirer/prompts';
 import { BaseCommand } from './BaseCommand.js';
-import { getPackage, getRegistryContract, getVersion, isVersionImmutable, } from '../lib/registry.js';
+import { getPackage, getRegistryContract, getVersion, isVersionImmutable } from '../lib/registry.js';
 import { canSign, loadCredentials } from '../lib/credentials.js';
 import { CLIWallet } from '../lib/wallet.js';
 import { buildTransactionParams, checkBalance, formatSats, getWalletAddress, } from '../lib/transaction.js';

package/build/commands/WebsiteDeployCommand.js

@@ -6,7 +6,7 @@ import { CLIWallet } from '../lib/wallet.js';
 import { canSign, loadCredentials } from '../lib/credentials.js';
 import { uploadDirectory, uploadFile } from '../lib/ipfs.js';
 import { formatFileSize } from '../lib/binary.js';
-import { getContenthash, getContenthashTypeName, getDomain, getResolverContract, getSubdomain, isSubdomain, parseDomainName, } from '../lib/resolver.js';
+import { getResolverContract, getDomain, getSubdomain, getContenthash, getContenthashTypeName, isSubdomain, parseDomainName, } from '../lib/resolver.js';
 import { buildTransactionParams, checkBalance, DEFAULT_FEE_RATE, DEFAULT_MAX_SAT_TO_SPEND, formatSats, getWalletAddress, waitForTransactionConfirmation, } from '../lib/transaction.js';
 export class WebsiteDeployCommand extends BaseCommand {
     constructor() {
@@ -17,7 +17,7 @@ export class WebsiteDeployCommand extends BaseCommand {
             .argument('<domain>', 'Domain name (e.g., mysite or mysite.btc)')
             .argument('<path>', 'Path to website directory or HTML file')
             .option('-n, --network <network>', 'Network to use', 'mainnet')
-            .option('--dry-run', "Upload to IPFS but don't update on-chain")
+            .option('--dry-run', 'Upload to IPFS but don\'t update on-chain')
             .option('-y, --yes', 'Skip confirmation prompts')
             .action((domain, websitePath, options) => this.execute(domain, websitePath, options || { network: 'mainnet' }));
     }
@@ -84,7 +84,7 @@ export class WebsiteDeployCommand extends BaseCommand {
             if (wallet.address.toHex() !== ownerAddress) {
                 this.logger.fail('You are not the owner of this domain');
                 this.logger.log(`Domain owner: ${ownerAddress}`);
-                this.logger.log(`Your address: ${wallet.p2trAddress}`);
+                this.logger.log(`Your address: ${wallet.address.toHex()}`);
                 process.exit(1);
             }
             this.logger.success('Ownership verified');

package/build/commands/WebsitePublishCommand.js

@@ -2,7 +2,7 @@ import { confirm } from '@inquirer/prompts';
 import { BaseCommand } from './BaseCommand.js';
 import { CLIWallet } from '../lib/wallet.js';
 import { canSign, loadCredentials } from '../lib/credentials.js';
-import { detectContenthashType, getContenthash, getContenthashTypeName, getDomain, getResolverContract, getSubdomain, isSubdomain, parseDomainName, validateCIDv0, validateCIDv1, validateIPNS, } from '../lib/resolver.js';
+import { getResolverContract, getDomain, getSubdomain, getContenthash, detectContenthashType, validateCIDv0, validateCIDv1, validateIPNS, getContenthashTypeName, isSubdomain, parseDomainName, } from '../lib/resolver.js';
 import { buildTransactionParams, checkBalance, DEFAULT_FEE_RATE, DEFAULT_MAX_SAT_TO_SPEND, formatSats, getWalletAddress, waitForTransactionConfirmation, } from '../lib/transaction.js';
 import { CONTENTHASH_TYPE_CIDv0, CONTENTHASH_TYPE_CIDv1, CONTENTHASH_TYPE_IPNS, CONTENTHASH_TYPE_SHA256, } from '../types/BtcResolver.js';
 export class WebsitePublishCommand extends BaseCommand {
@@ -110,8 +110,7 @@ export class WebsitePublishCommand extends BaseCommand {
             if (wallet.address.toHex() !== ownerAddress) {
                 this.logger.fail('You are not the owner of this domain');
                 this.logger.log(`Domain owner: ${ownerAddress}`);
-                this.logger.log(`Your address: ${wallet.p2trAddress}`);
-                this.logger.log(`MLDSA Public Key Hash:  ${wallet.address.toHex()}`);
+                this.logger.log(`Your address: ${wallet.address.toHex()}`);
                 process.exit(1);
             }
             this.logger.success('Ownership verified');

package/build/lib/ipfs.js

@@ -23,13 +23,17 @@ async function httpRequest(url, options, redirectCount = 0) {
         };
         const req = lib.request(reqOptions, (res) => {
             const statusCode = res.statusCode ?? 0;
-            if (followRedirect && statusCode >= 300 && statusCode < 400 && res.headers.location) {
-                const redirectUrl = new URL(res.headers.location, url).href;
-                res.resume();
-                httpRequest(redirectUrl, options, redirectCount + 1)
-                    .then(resolve)
-                    .catch(reject);
-                return;
+            if (followRedirect && statusCode >= 300 && statusCode < 400) {
+                const locationHeader = res.headers.location || res.headers['Location'];
+                const location = Array.isArray(locationHeader) ? locationHeader[0] : locationHeader;
+                if (location) {
+                    const redirectUrl = new URL(location, url).href;
+                    res.resume();
+                    httpRequest(redirectUrl, options, redirectCount + 1)
+                        .then(resolve)
+                        .catch(reject);
+                    return;
+                }
             }
             const chunks = [];
             res.on('data', (chunk) => {
@@ -37,6 +41,17 @@ async function httpRequest(url, options, redirectCount = 0) {
             });
             res.on('end', () => {
                 const body = Buffer.concat(chunks);
+                if (followRedirect && statusCode >= 300 && statusCode < 400) {
+                    const bodyStr = body.toString();
+                    const hrefMatch = bodyStr.match(/href="([^"]+)"/);
+                    if (hrefMatch && hrefMatch[1]) {
+                        const redirectUrl = new URL(hrefMatch[1], url).href;
+                        httpRequest(redirectUrl, options, redirectCount + 1)
+                            .then(resolve)
+                            .catch(reject);
+                        return;
+                    }
+                }
                 if (statusCode >= 200 && statusCode < 300) {
                     resolve(body);
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@btc-vision/cli",
-    "version": "1.0.8",
+    "version": "1.0.9",
     "type": "module",
     "description": "CLI for the OPNet plugin ecosystem - scaffolding, compilation, signing, and registry interaction",
     "author": "OP_NET",