@net-protocol/cli 0.2.3 → 0.2.6

package/dist/cli/index.mjs

@@ -7,7 +7,7 @@ import chalk4 from 'chalk';
 import * as fs6 from 'fs';
 import { readFileSync, existsSync, mkdirSync, writeFileSync } from 'fs';
 import { OPTIMAL_CHUNK_SIZE, StorageClient, detectFileTypeFromBase64, base64ToDataUri, shouldSuggestXmlStorage, getStorageKeyBytes, chunkDataForStorage, CHUNKED_STORAGE_CONTRACT, STORAGE_CONTRACT as STORAGE_CONTRACT$1, encodeStorageKeyForUrl } from '@net-protocol/storage';
-import { createPublicClient, http, createWalletClient, stringToHex, hexToString, parseEther, encodeFunctionData, publicActions, concat, defineChain, decodeEventLog, formatEther, isAddress } from 'viem';
+import { createPublicClient, http, createWalletClient, stringToHex, hexToString, parseEther, encodeFunctionData, publicActions, concat, defineChain, parseUnits, decodeEventLog, formatEther, isAddress } from 'viem';
 import { getSupportedChains, getNetContract, getChainName, getChainRpcUrls, getPublicClient, getBaseDataSuffix, NetClient, toBytes32, getChainBlockExplorer, NULL_ADDRESS, getChainSlug } from '@net-protocol/core';
 import { privateKeyToAccount } from 'viem/accounts';
 import { fundBackendWallet, checkBackendWalletBalance, createRelayX402Client, createRelaySession, batchTransactions, submitTransactionsViaRelay, waitForConfirmations, retryFailedTransactions as retryFailedTransactions$1 } from '@net-protocol/relay';
@@ -18,7 +18,7 @@ import { PROFILE_PICTURE_STORAGE_KEY, PROFILE_METADATA_STORAGE_KEY, parseProfile
 import { baseSepolia, base } from 'viem/chains';
 import * as path from 'path';
 import { join } from 'path';
-import { BazaarClient } from '@net-protocol/bazaar';
+import { BazaarClient, getErc20PaymentToken } from '@net-protocol/bazaar';
 import * as os from 'os';
 import { homedir } from 'os';
 import * as readline from 'readline';
@@ -3746,11 +3746,19 @@ function registerProfileCommand(program2) {
   profileCommand.addCommand(getCSSCommand);
   profileCommand.addCommand(cssPromptCommand);
 }
-
-// src/commands/bazaar/format.ts
 function formatEthPrice(price) {
   return price.toFixed(6).replace(/\.?0+$/, "");
 }
+function parseErc20Price(chainId, price) {
+  const paymentToken = getErc20PaymentToken(chainId);
+  if (!paymentToken) {
+    exitWithError(`Chain ${chainId} has no ERC20 payment token configured`);
+  }
+  return {
+    priceWei: parseUnits(price, paymentToken.decimals),
+    symbol: paymentToken.symbol
+  };
+}
 
 // src/commands/bazaar/list-listings.ts
 async function executeListListings(options) {
@@ -3910,8 +3918,8 @@ Sales (${sales.length}):
 }
 async function executeCreateListing(options) {
   const hasPrivateKey = !!(options.privateKey || process.env.NET_PRIVATE_KEY || process.env.PRIVATE_KEY);
-  if (!hasPrivateKey) {
-    await executeKeylessMode(options);
+  if (!hasPrivateKey || options.encodeOnly) {
+    await executeEncodeOnly3(options);
     return;
   }
   const commonOptions = parseCommonOptions({
@@ -3996,9 +4004,9 @@ async function executeCreateListing(options) {
     );
   }
 }
-async function executeKeylessMode(options) {
+async function executeEncodeOnly3(options) {
   if (!options.offerer) {
-    exitWithError("--offerer is required when not providing --private-key");
+    exitWithError("--offerer is required when using --encode-only without --private-key");
   }
   const readOnlyOptions = parseReadOnlyOptions({
     chainId: options.chainId,
@@ -4051,8 +4059,8 @@ function bigintReplacer(_key, value) {
 }
 async function executeCreateOffer(options) {
   const hasPrivateKey = !!(options.privateKey || process.env.NET_PRIVATE_KEY || process.env.PRIVATE_KEY);
-  if (!hasPrivateKey) {
-    await executeKeylessMode2(options);
+  if (!hasPrivateKey || options.encodeOnly) {
+    await executeEncodeOnly4(options);
     return;
   }
   const commonOptions = parseCommonOptions({
@@ -4135,9 +4143,9 @@ async function executeCreateOffer(options) {
     );
   }
 }
-async function executeKeylessMode2(options) {
+async function executeEncodeOnly4(options) {
   if (!options.offerer) {
-    exitWithError("--offerer is required when not providing --private-key");
+    exitWithError("--offerer is required when using --encode-only without --private-key");
   }
   const readOnlyOptions = parseReadOnlyOptions({
     chainId: options.chainId,
@@ -4197,7 +4205,7 @@ async function executeSubmitListing(options) {
     );
   }
   if (options.encodeOnly) {
-    await executeEncodeOnly3(options, orderData);
+    await executeEncodeOnly5(options, orderData);
     return;
   }
   const commonOptions = parseCommonOptions(
@@ -4248,7 +4256,7 @@ async function executeSubmitListing(options) {
     );
   }
 }
-async function executeEncodeOnly3(options, orderData) {
+async function executeEncodeOnly5(options, orderData) {
   const readOnlyOptions = parseReadOnlyOptions({
     chainId: options.chainId,
     rpcUrl: options.rpcUrl
@@ -4279,7 +4287,7 @@ async function executeSubmitOffer(options) {
     );
   }
   if (options.encodeOnly) {
-    await executeEncodeOnly4(options, orderData);
+    await executeEncodeOnly6(options, orderData);
     return;
   }
   const commonOptions = parseCommonOptions(
@@ -4330,7 +4338,7 @@ async function executeSubmitOffer(options) {
     );
   }
 }
-async function executeEncodeOnly4(options, orderData) {
+async function executeEncodeOnly6(options, orderData) {
   const readOnlyOptions = parseReadOnlyOptions({
     chainId: options.chainId,
     rpcUrl: options.rpcUrl
@@ -4352,7 +4360,7 @@ async function executeEncodeOnly4(options, orderData) {
 }
 async function executeBuyListing(options) {
   if (options.encodeOnly) {
-    await executeEncodeOnly5(options);
+    await executeEncodeOnly7(options);
     return;
   }
   const commonOptions = parseCommonOptions(
@@ -4431,7 +4439,7 @@ async function executeBuyListing(options) {
     );
   }
 }
-async function executeEncodeOnly5(options) {
+async function executeEncodeOnly7(options) {
   if (!options.buyer) {
     exitWithError("--buyer is required when using --encode-only without --private-key");
   }
@@ -4482,7 +4490,7 @@ async function executeEncodeOnly5(options) {
 }
 async function executeAcceptOffer(options) {
   if (options.encodeOnly) {
-    await executeEncodeOnly6(options);
+    await executeEncodeOnly8(options);
     return;
   }
   const commonOptions = parseCommonOptions(
@@ -4565,7 +4573,7 @@ async function executeAcceptOffer(options) {
     );
   }
 }
-async function executeEncodeOnly6(options) {
+async function executeEncodeOnly8(options) {
   if (!options.seller) {
     exitWithError("--seller is required when using --encode-only without --private-key");
   }
@@ -4773,8 +4781,8 @@ ERC-20 Offers (${offers.length}):
 }
 async function executeCreateErc20Listing(options) {
   const hasPrivateKey = !!(options.privateKey || process.env.NET_PRIVATE_KEY || process.env.PRIVATE_KEY);
-  if (!hasPrivateKey) {
-    await executeKeylessMode3(options);
+  if (!hasPrivateKey || options.encodeOnly) {
+    await executeEncodeOnly9(options);
     return;
   }
   const commonOptions = parseCommonOptions({
@@ -4787,7 +4795,10 @@ async function executeCreateErc20Listing(options) {
     chainId: commonOptions.chainId,
     rpcUrl: commonOptions.rpcUrl
   });
-  const priceWei = parseEther(options.price);
+  const { priceWei, symbol: paymentSymbol } = parseErc20Price(
+    commonOptions.chainId,
+    options.price
+  );
   const tokenAmount = BigInt(options.tokenAmount);
   try {
     console.log(chalk4.blue("Preparing ERC-20 listing..."));
@@ -4852,7 +4863,7 @@ async function executeCreateErc20Listing(options) {
   Transaction: ${hash}
   Token: ${options.tokenAddress}
   Amount: ${options.tokenAmount}
-  Price: ${options.price} ETH`
+  Price: ${options.price} ${paymentSymbol}`
       )
     );
   } catch (error) {
@@ -4861,9 +4872,9 @@ async function executeCreateErc20Listing(options) {
     );
   }
 }
-async function executeKeylessMode3(options) {
+async function executeEncodeOnly9(options) {
   if (!options.offerer) {
-    exitWithError("--offerer is required when not providing --private-key");
+    exitWithError("--offerer is required when using --encode-only without --private-key");
   }
   const readOnlyOptions = parseReadOnlyOptions({
     chainId: options.chainId,
@@ -4873,7 +4884,7 @@ async function executeKeylessMode3(options) {
     chainId: readOnlyOptions.chainId,
     rpcUrl: readOnlyOptions.rpcUrl
   });
-  const priceWei = parseEther(options.price);
+  const { priceWei } = parseErc20Price(readOnlyOptions.chainId, options.price);
   const tokenAmount = BigInt(options.tokenAmount);
   try {
     const prepared = await bazaarClient.prepareCreateErc20Listing({
@@ -4917,8 +4928,8 @@ function bigintReplacer3(_key, value) {
 }
 async function executeCreateErc20Offer(options) {
   const hasPrivateKey = !!(options.privateKey || process.env.NET_PRIVATE_KEY || process.env.PRIVATE_KEY);
-  if (!hasPrivateKey) {
-    await executeKeylessMode4(options);
+  if (!hasPrivateKey || options.encodeOnly) {
+    await executeEncodeOnly10(options);
     return;
   }
   const commonOptions = parseCommonOptions({
@@ -4931,7 +4942,10 @@ async function executeCreateErc20Offer(options) {
     chainId: commonOptions.chainId,
     rpcUrl: commonOptions.rpcUrl
   });
-  const priceWei = parseEther(options.price);
+  const { priceWei, symbol: paymentSymbol } = parseErc20Price(
+    commonOptions.chainId,
+    options.price
+  );
   const tokenAmount = BigInt(options.tokenAmount);
   try {
     console.log(chalk4.blue("Preparing ERC-20 offer..."));
@@ -4995,7 +5009,7 @@ async function executeCreateErc20Offer(options) {
   Transaction: ${hash}
   Token: ${options.tokenAddress}
   Amount: ${options.tokenAmount}
-  Price: ${options.price} ETH`
+  Price: ${options.price} ${paymentSymbol}`
       )
     );
   } catch (error) {
@@ -5004,9 +5018,9 @@ async function executeCreateErc20Offer(options) {
     );
   }
 }
-async function executeKeylessMode4(options) {
+async function executeEncodeOnly10(options) {
   if (!options.offerer) {
-    exitWithError("--offerer is required when not providing --private-key");
+    exitWithError("--offerer is required when using --encode-only without --private-key");
   }
   const readOnlyOptions = parseReadOnlyOptions({
     chainId: options.chainId,
@@ -5016,7 +5030,7 @@ async function executeKeylessMode4(options) {
     chainId: readOnlyOptions.chainId,
     rpcUrl: readOnlyOptions.rpcUrl
   });
-  const priceWei = parseEther(options.price);
+  const { priceWei } = parseErc20Price(readOnlyOptions.chainId, options.price);
   const tokenAmount = BigInt(options.tokenAmount);
   try {
     const prepared = await bazaarClient.prepareCreateErc20Offer({
@@ -5068,7 +5082,7 @@ async function executeSubmitErc20Listing(options) {
     );
   }
   if (options.encodeOnly) {
-    await executeEncodeOnly7(options, orderData);
+    await executeEncodeOnly11(options, orderData);
     return;
   }
   const commonOptions = parseCommonOptions(
@@ -5119,7 +5133,7 @@ async function executeSubmitErc20Listing(options) {
     );
   }
 }
-async function executeEncodeOnly7(options, orderData) {
+async function executeEncodeOnly11(options, orderData) {
   const readOnlyOptions = parseReadOnlyOptions({
     chainId: options.chainId,
     rpcUrl: options.rpcUrl
@@ -5150,7 +5164,7 @@ async function executeSubmitErc20Offer(options) {
     );
   }
   if (options.encodeOnly) {
-    await executeEncodeOnly8(options, orderData);
+    await executeEncodeOnly12(options, orderData);
     return;
   }
   const commonOptions = parseCommonOptions(
@@ -5201,7 +5215,7 @@ async function executeSubmitErc20Offer(options) {
     );
   }
 }
-async function executeEncodeOnly8(options, orderData) {
+async function executeEncodeOnly12(options, orderData) {
   const readOnlyOptions = parseReadOnlyOptions({
     chainId: options.chainId,
     rpcUrl: options.rpcUrl
@@ -5223,7 +5237,7 @@ async function executeEncodeOnly8(options, orderData) {
 }
 async function executeBuyErc20Listing(options) {
   if (options.encodeOnly) {
-    await executeEncodeOnly9(options);
+    await executeEncodeOnly13(options);
     return;
   }
   const commonOptions = parseCommonOptions(
@@ -5303,7 +5317,7 @@ async function executeBuyErc20Listing(options) {
     );
   }
 }
-async function executeEncodeOnly9(options) {
+async function executeEncodeOnly13(options) {
   if (!options.buyer) {
     exitWithError("--buyer is required when using --encode-only without --private-key");
   }
@@ -5354,7 +5368,7 @@ async function executeEncodeOnly9(options) {
 }
 async function executeAcceptErc20Offer(options) {
   if (options.encodeOnly) {
-    await executeEncodeOnly10(options);
+    await executeEncodeOnly14(options);
     return;
   }
   const commonOptions = parseCommonOptions(
@@ -5437,7 +5451,7 @@ async function executeAcceptErc20Offer(options) {
     );
   }
 }
-async function executeEncodeOnly10(options) {
+async function executeEncodeOnly14(options) {
   if (!options.seller) {
     exitWithError("--seller is required when using --encode-only without --private-key");
   }
@@ -5516,7 +5530,7 @@ async function executeTransaction(walletClient, txConfig) {
 // src/commands/bazaar/cancel-listing.ts
 async function executeCancelListing(options) {
   if (options.encodeOnly) {
-    await executeEncodeOnly11(options);
+    await executeEncodeOnly15(options);
     return;
   }
   const commonOptions = parseCommonOptions(
@@ -5568,7 +5582,7 @@ async function executeCancelListing(options) {
     );
   }
 }
-async function executeEncodeOnly11(options) {
+async function executeEncodeOnly15(options) {
   if (!options.maker) {
     exitWithError("--maker is required when using --encode-only without --private-key");
   }
@@ -5605,7 +5619,7 @@ async function executeEncodeOnly11(options) {
 }
 async function executeCancelOffer(options) {
   if (options.encodeOnly) {
-    await executeEncodeOnly12(options);
+    await executeEncodeOnly16(options);
     return;
   }
   const commonOptions = parseCommonOptions(
@@ -5657,7 +5671,7 @@ async function executeCancelOffer(options) {
     );
   }
 }
-async function executeEncodeOnly12(options) {
+async function executeEncodeOnly16(options) {
   if (!options.maker) {
     exitWithError("--maker is required when using --encode-only without --private-key");
   }
@@ -5693,7 +5707,7 @@ async function executeEncodeOnly12(options) {
 }
 async function executeCancelErc20Listing(options) {
   if (options.encodeOnly) {
-    await executeEncodeOnly13(options);
+    await executeEncodeOnly17(options);
     return;
   }
   const commonOptions = parseCommonOptions(
@@ -5746,7 +5760,7 @@ async function executeCancelErc20Listing(options) {
     );
   }
 }
-async function executeEncodeOnly13(options) {
+async function executeEncodeOnly17(options) {
   if (!options.maker) {
     exitWithError("--maker is required when using --encode-only without --private-key");
   }
@@ -5783,7 +5797,7 @@ async function executeEncodeOnly13(options) {
 }
 async function executeCancelErc20Offer(options) {
   if (options.encodeOnly) {
-    await executeEncodeOnly14(options);
+    await executeEncodeOnly18(options);
     return;
   }
   const commonOptions = parseCommonOptions(
@@ -5835,7 +5849,7 @@ async function executeCancelErc20Offer(options) {
     );
   }
 }
-async function executeEncodeOnly14(options) {
+async function executeEncodeOnly18(options) {
   if (!options.maker) {
     exitWithError("--maker is required when using --encode-only without --private-key");
   }
@@ -5910,7 +5924,7 @@ function registerBazaarCommand(program2) {
       json: options.json
     });
   });
-  const createListingCommand = new Command("create-listing").description("Create an NFT listing (with --private-key: full flow; without: output EIP-712 data)").requiredOption("--nft-address <address>", "NFT contract address").requiredOption("--token-id <id>", "Token ID to list").requiredOption("--price <eth>", "Price in ETH (e.g., 0.1)").option("--target-fulfiller <address>", "Make a private listing for this address").option("--offerer <address>", "Offerer address (required without --private-key)").option(...privateKeyOption).option(...chainIdOption).option(...rpcUrlOption).action(async (options) => {
+  const createListingCommand = new Command("create-listing").description("Create an NFT listing (with --private-key: full flow; without or with --encode-only: output EIP-712 data)").requiredOption("--nft-address <address>", "NFT contract address").requiredOption("--token-id <id>", "Token ID to list").requiredOption("--price <eth>", "Price in ETH (e.g., 0.1)").option("--target-fulfiller <address>", "Make a private listing for this address").option("--offerer <address>", "Offerer address (required without --private-key or with --encode-only)").option(...privateKeyOption).option(...chainIdOption).option(...rpcUrlOption).option("--encode-only", "Output EIP-712 data and approval calldata as JSON instead of executing").action(async (options) => {
     await executeCreateListing({
       nftAddress: options.nftAddress,
       tokenId: options.tokenId,
@@ -5919,17 +5933,19 @@ function registerBazaarCommand(program2) {
       offerer: options.offerer,
       privateKey: options.privateKey,
       chainId: options.chainId,
-      rpcUrl: options.rpcUrl
+      rpcUrl: options.rpcUrl,
+      encodeOnly: options.encodeOnly
     });
   });
-  const createOfferCommand = new Command("create-offer").description("Create a collection offer (with --private-key: full flow; without: output EIP-712 data)").requiredOption("--nft-address <address>", "NFT contract address").requiredOption("--price <eth>", "Offer price in ETH (e.g., 0.1)").option("--offerer <address>", "Offerer address (required without --private-key)").option(...privateKeyOption).option(...chainIdOption).option(...rpcUrlOption).action(async (options) => {
+  const createOfferCommand = new Command("create-offer").description("Create a collection offer (with --private-key: full flow; without or with --encode-only: output EIP-712 data)").requiredOption("--nft-address <address>", "NFT contract address").requiredOption("--price <eth>", "Offer price in ETH (e.g., 0.1)").option("--offerer <address>", "Offerer address (required without --private-key or with --encode-only)").option(...privateKeyOption).option(...chainIdOption).option(...rpcUrlOption).option("--encode-only", "Output EIP-712 data and approval calldata as JSON instead of executing").action(async (options) => {
     await executeCreateOffer({
       nftAddress: options.nftAddress,
       price: options.price,
       offerer: options.offerer,
       privateKey: options.privateKey,
       chainId: options.chainId,
-      rpcUrl: options.rpcUrl
+      rpcUrl: options.rpcUrl,
+      encodeOnly: options.encodeOnly
     });
   });
   const submitListingCommand = new Command("submit-listing").description("Submit a signed listing (follow-up to create-listing without --private-key)").requiredOption("--order-data <path>", "Path to order JSON file from create-listing output").requiredOption("--signature <sig>", "EIP-712 signature (0x-prefixed)").option(...privateKeyOption).option(...chainIdOption).option(...rpcUrlOption).option("--encode-only", "Output transaction data as JSON instead of executing").action(async (options) => {
@@ -6002,7 +6018,7 @@ function registerBazaarCommand(program2) {
       json: options.json
     });
   });
-  const createErc20ListingCommand = new Command("create-erc20-listing").description("Create an ERC-20 token listing (with --private-key: full flow; without: output EIP-712 data)").requiredOption("--token-address <address>", "ERC-20 token contract address").requiredOption("--token-amount <amount>", "Token amount in raw units (bigint string)").requiredOption("--price <eth>", "Total price in ETH for the token amount").option("--target-fulfiller <address>", "Make a private listing for this address").option("--offerer <address>", "Offerer address (required without --private-key)").option(...privateKeyOption).option(...chainIdOption).option(...rpcUrlOption).action(async (options) => {
+  const createErc20ListingCommand = new Command("create-erc20-listing").description("Create an ERC-20 token listing (with --private-key: full flow; without or with --encode-only: output EIP-712 data)").requiredOption("--token-address <address>", "ERC-20 token contract address").requiredOption("--token-amount <amount>", "Token amount in raw units (bigint string)").requiredOption("--price <amount>", "Total price in payment-token units (USDC on Base, WETH elsewhere)").option("--target-fulfiller <address>", "Make a private listing for this address").option("--offerer <address>", "Offerer address (required without --private-key or with --encode-only)").option(...privateKeyOption).option(...chainIdOption).option(...rpcUrlOption).option("--encode-only", "Output EIP-712 data and approval calldata as JSON instead of executing").action(async (options) => {
     await executeCreateErc20Listing({
       tokenAddress: options.tokenAddress,
       tokenAmount: options.tokenAmount,
@@ -6011,10 +6027,11 @@ function registerBazaarCommand(program2) {
       offerer: options.offerer,
       privateKey: options.privateKey,
       chainId: options.chainId,
-      rpcUrl: options.rpcUrl
+      rpcUrl: options.rpcUrl,
+      encodeOnly: options.encodeOnly
     });
   });
-  const createErc20OfferCommand = new Command("create-erc20-offer").description("Create an ERC-20 token offer (with --private-key: full flow; without: output EIP-712 data)").requiredOption("--token-address <address>", "ERC-20 token contract address").requiredOption("--token-amount <amount>", "Token amount in raw units (bigint string)").requiredOption("--price <eth>", "Total price in ETH for the token amount").option("--offerer <address>", "Offerer address (required without --private-key)").option(...privateKeyOption).option(...chainIdOption).option(...rpcUrlOption).action(async (options) => {
+  const createErc20OfferCommand = new Command("create-erc20-offer").description("Create an ERC-20 token offer (with --private-key: full flow; without or with --encode-only: output EIP-712 data)").requiredOption("--token-address <address>", "ERC-20 token contract address").requiredOption("--token-amount <amount>", "Token amount in raw units (bigint string)").requiredOption("--price <amount>", "Total price in payment-token units (USDC on Base, WETH elsewhere)").option("--offerer <address>", "Offerer address (required without --private-key or with --encode-only)").option(...privateKeyOption).option(...chainIdOption).option(...rpcUrlOption).option("--encode-only", "Output EIP-712 data and approval calldata as JSON instead of executing").action(async (options) => {
     await executeCreateErc20Offer({
       tokenAddress: options.tokenAddress,
       tokenAmount: options.tokenAmount,
@@ -6022,7 +6039,8 @@ function registerBazaarCommand(program2) {
       offerer: options.offerer,
       privateKey: options.privateKey,
       chainId: options.chainId,
-      rpcUrl: options.rpcUrl
+      rpcUrl: options.rpcUrl,
+      encodeOnly: options.encodeOnly
     });
   });
   const submitErc20ListingCommand = new Command("submit-erc20-listing").description("Submit a signed ERC-20 listing (follow-up to create-erc20-listing without --private-key)").requiredOption("--order-data <path>", "Path to order JSON file from create-erc20-listing output").requiredOption("--signature <sig>", "EIP-712 signature (0x-prefixed)").option(...privateKeyOption).option(...chainIdOption).option(...rpcUrlOption).option("--encode-only", "Output transaction data as JSON instead of executing").action(async (options) => {